From ec9d24a5efd7feb3a5f6fc8e8a303b2429b5e4e3 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 6 Jun 2006 08:31:48 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: mpeg4 parsing still utterly broken :( Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open): mpeg4 parsing still utterly broken :( --- ChangeLog | 5 +++++ common | 2 +- ext/ffmpeg/gstffmpegdec.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 169bccdb72..0ac48e5f93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-06 Edward Hervey + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open): + mpeg4 parsing still utterly broken :( + 2006-06-02 Edward Hervey * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain): diff --git a/common b/common index 80b4e2c087..4282dfa89d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 80b4e2c08717159760ebaa40715f8919b3f77ba9 +Subproject commit 4282dfa89d50e80f59d4e1837af95fbf74e75d18 diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index a632faf1a8..f0b57d0216 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -478,7 +478,8 @@ gst_ffmpegdec_open (GstFFMpegDec * ffmpegdec) /* open a parser if we can - exclude mp3 because it doesn't work (?), * and mjpeg because ... */ - if (oclass->in_plugin->id != CODEC_ID_MJPEG && + if (oclass->in_plugin->id != CODEC_ID_MPEG4 && + oclass->in_plugin->id != CODEC_ID_MJPEG && oclass->in_plugin->id != CODEC_ID_MP3 && oclass->in_plugin->id != CODEC_ID_H264) { ffmpegdec->pctx = av_parser_init (oclass->in_plugin->id);