diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-07-24 15:36:54 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-07-24 15:36:54 +0200 |
| commit | 15ddde6ef606f4c001c9632446eeb47e2838787f (patch) | |
| tree | b9fe5e7f4c4cc172700a1297fda0ac5fdd1f3507 | |
| parent | 403c48ae10405f745a45c0264b045efaa4c39975 (diff) | |
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
| -rw-r--r-- | gst/avi/gstavidemux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 7e6288fd7..0e4370976 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -4487,10 +4487,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 |