diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2007-06-05 16:33:39 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2007-06-05 16:33:39 +0000 |
| commit | 7f7a5d9d0bf6eac735d53b8437d430ee4265cbaf (patch) | |
| tree | cd5a64d80e6891e638f462c33f879adf32d20d23 | |
| parent | ddbf1ee10cd353a5ad403d46f64bb8c155fcd85d (diff) | |
ext/ffmpeg/gstffmpegcodecmap.c: Add MSMPEG4V3 video and MP3 audio to the asf muxer supported formats.
Original commit message from CVS:
Patch by: <bram at luon dot net>
* ext/ffmpeg/gstffmpegcodecmap.c:
(gst_ffmpeg_formatid_get_codecids):
Add MSMPEG4V3 video and MP3 audio to the asf muxer supported formats.
Fixes #444384.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2007-06-05 Wim Taymans <wim@fluendo.com> + Patch by: <bram at luon dot net> + + * ext/ffmpeg/gstffmpegcodecmap.c: + (gst_ffmpeg_formatid_get_codecids): + Add MSMPEG4V3 video and MP3 audio to the asf muxer supported formats. + Fixes #444384. + +2007-06-05 Wim Taymans <wim@fluendo.com> + Patch by: Jan Arne Petersen <jpetersen at jpetersen dot org> * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_query): diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 63f15af..1cf3d65 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -1821,9 +1821,9 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name, *audio_codec_list = flv_audio_list; } else if (!strcmp (format_name, "asf")) { static enum CodecID asf_video_list[] = - { CODEC_ID_WMV1, CODEC_ID_WMV2, CODEC_ID_NONE }; + { CODEC_ID_WMV1, CODEC_ID_WMV2, CODEC_ID_MSMPEG4V3, CODEC_ID_NONE }; static enum CodecID asf_audio_list[] = - { CODEC_ID_WMAV1, CODEC_ID_WMAV2, CODEC_ID_NONE }; + { CODEC_ID_WMAV1, CODEC_ID_WMAV2, CODEC_ID_MP3, CODEC_ID_NONE }; *video_codec_list = asf_video_list; *audio_codec_list = asf_audio_list; |