From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 24 Jul 2012 13:36:54 +0000 (+0200)
Subject: Revert "avidemux: Don't consider 0 fcc_handler as uncompressed."
X-Git-Tag: 1.19.3~509^2~6840
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5369901ade08d79369ee6fb04fdecf1dd022ad9;p=platform%2Fupstream%2Fgstreamer.git

Revert "avidemux: Don't consider 0 fcc_handler as uncompressed."

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
---

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 278c06d..4c12ea7 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -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