Revert "avidemux: Don't consider 0 fcc_handler as uncompressed."
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Tue, 24 Jul 2012 13:36:54 +0000 (15:36 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Tue, 24 Jul 2012 14:05:31 +0000 (16:05 +0200)
This reverts commit c6b9f5b25ab435669816a07049b0e5a8f01e09ca.

fourcc GST_RIFF_rgb = 0 still leads to raw uncompressed rgb caps.

See also https://bugzilla.gnome.org/show_bug.cgi?id=673898

gst/avi/gstavidemux.c

index 278c06d..4c12ea7 100644 (file)
@@ -4444,10 +4444,9 @@ swap_line (guint8 * d1, guint8 * d2, guint8 * tmp, gint bytes)
 
 
 #define gst_avi_demux_is_uncompressed(fourcc)          \
-  (fourcc &&                                           \
-    (fourcc == GST_RIFF_DIB ||                         \
-     fourcc == GST_RIFF_rgb ||                         \
-     fourcc == GST_RIFF_RGB || fourcc == GST_RIFF_RAW))
+  (fourcc == GST_RIFF_DIB ||                           \
+   fourcc == GST_RIFF_rgb ||                           \
+   fourcc == GST_RIFF_RGB || fourcc == GST_RIFF_RAW)
 
 /*
  * Invert DIB buffers... Takes existing buffer and