From 9a360a58b027cbb3b93bb58fb0f1a69e9bbc8226 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 6 Mar 2005 13:38:53 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.c: Add MPEG-4 audio for debugging. Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): Add MPEG-4 audio for debugging. --- ChangeLog | 15 +++++---------- ext/ffmpeg/gstffmpegcodecmap.c | 5 ++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9578d8ecb4..45911603cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-06 Ronald S. Bultje + + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): + Add MPEG-4 audio for debugging. + 2005-02-05 Ronald S. Bultje * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_link): @@ -25,16 +30,6 @@ * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame): Don´t SIGFPE right away. -2005-02-01 Ronald S. Bultje - - reviewed by: - - * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_lowres_get_type), - (gst_ffmpegdec_skipframe_get_type), (gst_ffmpegdec_class_init), - (gst_ffmpegdec_init), (gst_ffmpegdec_connect), - (gst_ffmpegdec_frame), (gst_ffmpegdec_set_property), - (gst_ffmpegdec_get_property): - 2005-01-31 Ronald S. Bultje * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_lowres_get_type), diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 01027af14f..4c7e758dc4 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -403,9 +403,8 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id, case CODEC_ID_AAC: case CODEC_ID_MPEG4AAC: - /* ffmpeg uses libfaac/libfaad for those. We do not ship these as - * part of ffmpeg, so defining those is useless. Besides, we have - * our own faad/faac plugins. */ + caps = GST_FF_AUD_CAPS_NEW ("audio/mpeg", + "mpegversion", G_TYPE_INT, 4, NULL); break; case CODEC_ID_ASV1: