summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-07-24 15:38:24 +0200
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-07-24 15:38:24 +0200
commitadac94e23432ac7448ca3c1247eb9bff22b20b9e (patch)
tree09cf3d3ddc8af6c3b9adee1c82c73f53686569df
parent15ddde6ef606f4c001c9632446eeb47e2838787f (diff)
avidemux: use same fourcc to determine caps in determining uncompressed-ness
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=673898
-rw-r--r--gst/avi/gstavidemux.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 0e4370976..89296ad53 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -4504,11 +4504,14 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf)
gint y, w, h;
gint bpp, stride;
guint8 *tmp = NULL;
+ guint32 fourcc;
if (stream->strh->type != GST_RIFF_FCC_vids)
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 */
}