diff options
| author | Jeremy Simon <jsimon13@yahoo.fr> | 2004-01-20 21:22:46 +0000 |
|---|---|---|
| committer | Jeremy Simon <jsimon13@yahoo.fr> | 2004-01-20 21:22:46 +0000 |
| commit | cfcbc7800f71dab213bca525b0004d59950e6c20 (patch) | |
| tree | 818e75a7a1003d80b7c1d7e2328f80b9ac2efcd2 | |
| parent | 3f9cd6434f6b0eb10ef4e33ed3d2c9d770dd5f19 (diff) | |
| download | gst-libav-cfcbc7800f71dab213bca525b0004d59950e6c20.tar.gz | |
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)
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |