From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 24 Jul 2012 13:38:24 +0000 (+0200)
Subject: avidemux: use same fourcc to determine caps in determining uncompressed-ness
X-Git-Tag: 1.19.3~509^2~6839
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cb106d690a7622a7ab3ee0ef98d15d84cfc0901;p=platform%2Fupstream%2Fgstreamer.git

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

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 4c12ea7..24f6bcd 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -4463,11 +4463,14 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf)
   guint8 *tmp = NULL;
   GstMapInfo map;
   GstCaps *caps;
+  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 */
   }