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 (file)
--- 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;