From ef0add87638cbb4597ab132b8ea4221ddf599a6d 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) --- ChangeLog | 7 +++++++ gst/asfdemux/gstasfdemux.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62b67f44ae..6e5f93a568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-20 Jeremy Simon + + * 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) + 2004-01-20 Thomas Vander Stichele * gst-libs/gst/media-info/media-info-priv.c: diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index b4fa427a5f..71faeb73d5 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -1316,7 +1316,7 @@ gst_asf_demux_audio_caps (guint16 codec_id, if (audio != NULL) { gst_caps_set_simple (caps, "flags1", G_TYPE_INT, flags1, - "flags2", G_TYPE_INT, flags1, + "flags2", G_TYPE_INT, flags2, "block_align", G_TYPE_INT, audio->block_align, "bitrate", G_TYPE_INT, audio->byte_rate * 8, NULL); @@ -1339,7 +1339,7 @@ gst_asf_demux_audio_caps (guint16 codec_id, if (audio != NULL) { gst_caps_set_simple (caps, "flags1", G_TYPE_INT, flags1, - "flags2", G_TYPE_INT, flags1, + "flags2", G_TYPE_INT, flags2, "block_align", G_TYPE_INT, audio->block_align, "bitrate", G_TYPE_INT, audio->byte_rate * 8, NULL);