From: Jeremy Simon <jsimon13@yahoo.fr>
Date: Tue, 20 Jan 2004 21:22:46 +0000 (+0000)
Subject: ext/ffmpeg/gstffmpegcodecmap.c: Fix wma caps property
X-Git-Tag: 1.19.3~499^2~2047
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfcbc7800f71dab213bca525b0004d59950e6c20;p=platform%2Fupstream%2Fgstreamer.git

ext/ffmpeg/gstffmpegcodecmap.c: Fix wma caps property

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_extradata):
Fix wma caps property
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_audio_caps):
Fix typo (flags1 and flags2)
---

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 8f82737..7631733 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -628,8 +628,8 @@ gst_ffmpeg_caps_to_extradata (const GstCaps *caps,
   if (!strcmp(mimetype, "audio/x-wma")) {
     gint flags1, flags2, wmaversion = 0;
 
-    if (!gst_structure_get_int (structure, "flags1", &flags1) &&
-	!gst_structure_get_int (structure, "flags2", &flags2) &&
+    if (!gst_structure_get_int (structure, "flags1", &flags1) ||
+	!gst_structure_get_int (structure, "flags2", &flags2) ||
 	!gst_structure_get_int (structure, "wmaversion", &wmaversion)) {
       g_warning ("invalid caps for audio/x-wma");
       return;