Commit cfcbc780 authored by Jeremy Simon's avatar Jeremy Simon

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)
parent 3f9cd643
...@@ -628,8 +628,8 @@ gst_ffmpeg_caps_to_extradata (const GstCaps *caps, ...@@ -628,8 +628,8 @@ gst_ffmpeg_caps_to_extradata (const GstCaps *caps,
if (!strcmp(mimetype, "audio/x-wma")) { if (!strcmp(mimetype, "audio/x-wma")) {
gint flags1, flags2, wmaversion = 0; gint flags1, flags2, wmaversion = 0;
if (!gst_structure_get_int (structure, "flags1", &flags1) && if (!gst_structure_get_int (structure, "flags1", &flags1) ||
!gst_structure_get_int (structure, "flags2", &flags2) && !gst_structure_get_int (structure, "flags2", &flags2) ||
!gst_structure_get_int (structure, "wmaversion", &wmaversion)) { !gst_structure_get_int (structure, "wmaversion", &wmaversion)) {
g_warning ("invalid caps for audio/x-wma"); g_warning ("invalid caps for audio/x-wma");
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment