ensure we can call get_info before init_context without crashing!

git-svn-id: https://xpra.org/svn/Xpra/trunk@4809 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Nov 28, 2013 · 7f74e51 · 7f74e51
1 parent fbaa20c
commit 7f74e51
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/xpra/codecs/csc_swscale/colorspace_converter.pyx b/src/xpra/codecs/csc_swscale/colorspace_converter.pyx
@@ -289,10 +289,12 @@ cdef class ColorspaceConverter:
                 "frames"    : self.frames,
                 "src_width" : self.src_width,
                 "src_height": self.src_height,
-                "src_format": self.src_format,
                 "dst_width" : self.dst_width,
-                "dst_height": self.dst_height,
-                "dst_format": self.dst_format}
+                "dst_height": self.dst_height}
+        if self.src_format:
+            info["src_format"] = self.src_format
+        if self.dst_format:
+            info["dst_format"] = self.dst_format
         if self.frames>0 and self.time>0:
             pps = float(self.src_width) * float(self.src_height) * float(self.frames) / self.time
             info["total_time_ms"] = int(self.time*1000.0)