Commit 6cb106d6 authored by Mark Nauwelaerts's avatar Mark Nauwelaerts

avidemux: use same fourcc to determine caps in determining uncompressed-ness

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

Conflicts:

	gst/avi/gstavidemux.c
parent e5369901
...@@ -4463,11 +4463,14 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf) ...@@ -4463,11 +4463,14 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf)
guint8 *tmp = NULL; guint8 *tmp = NULL;
GstMapInfo map; GstMapInfo map;
GstCaps *caps; GstCaps *caps;
guint32 fourcc;
if (stream->strh->type != GST_RIFF_FCC_vids) if (stream->strh->type != GST_RIFF_FCC_vids)
return buf; return buf;
if (!gst_avi_demux_is_uncompressed (stream->strh->fcc_handler)) { fourcc = (stream->strf.vids->compression) ?
stream->strf.vids->compression : stream->strh->fcc_handler;
if (!gst_avi_demux_is_uncompressed (fourcc)) {
return buf; /* Ignore non DIB buffers */ return buf; /* Ignore non DIB buffers */
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment