From 62552c8e06ba4f3bc8e634997a01a3a9436b9bb6 Mon Sep 17 00:00:00 2001
From: Sebastien Vincent <seb@jitsi.org>
Date: Thu, 4 Mar 2010 09:27:37 +0000
Subject: [PATCH] Negociated size was not properly set when a callee send video
 stream to caller.

---
 .../impl/protocol/sip/CallPeerMediaHandler.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
index 7949eb81e..8acb2904e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
@@ -859,18 +859,18 @@ private MediaStream initStream(StreamConnector      connector,
             else
                 stream = mediaService.createMediaStream(
                                             connector, device, control);
-
-            /* set negociated output size for video stream */
-            if(device.getMediaType() == MediaType.VIDEO)
-            {
-                ((VideoMediaStream)stream).setOutputSize(size);
-            }
         }
         else
         {
             //this is a reinit
         }
 
+        /* set negociated output size for video stream */
+        if(device != null && device.getMediaType() == MediaType.VIDEO)
+        {
+            ((VideoMediaStream)stream).setOutputSize(size);
+        }
+
         return  configureAndStartStream(
                         device, format, target, direction, stream);
     }