From cfcbc7800f71dab213bca525b0004d59950e6c20 Mon Sep 17 00:00:00 2001 From: Jeremy Simon Date: Tue, 20 Jan 2004 21:22:46 +0000 Subject: [PATCH] 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) --- ext/ffmpeg/gstffmpegcodecmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 8f82737864..763173364d 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;