diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-01-24 18:27:52 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-01-24 18:30:57 +0100 |
| commit | c6b9f5b25ab435669816a07049b0e5a8f01e09ca (patch) | |
| tree | 2c546d42ed5f1c979739b43809e457b107465707 | |
| parent | 899dad89498bb00da02ea1163370e69b082bf57b (diff) | |
avidemux: Don't consider 0 fcc_handler as uncompressed.
Just avoids a warning
| -rw-r--r-- | gst/avi/gstavidemux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 5e4c1be98..c2741e32b 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -4417,9 +4417,10 @@ swap_line (guint8 * d1, guint8 * d2, guint8 * tmp, gint bytes) #define gst_avi_demux_is_uncompressed(fourcc) \ - (fourcc == GST_RIFF_DIB || \ - fourcc == GST_RIFF_rgb || \ - fourcc == GST_RIFF_RGB || fourcc == GST_RIFF_RAW) + (fourcc && \ + (fourcc == GST_RIFF_DIB || \ + fourcc == GST_RIFF_rgb || \ + fourcc == GST_RIFF_RGB || fourcc == GST_RIFF_RAW)) /* * Invert DIB buffers... Takes existing buffer and |