diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-03 13:44:04 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-03 13:44:04 +0000 |
| commit | 9e7000b54a48ed1f56ac339f7c6988406e6034f9 (patch) | |
| tree | 36bacdee9d3060805d2f6d01176f8a12c026843d | |
| parent | 722d9491dd0ea7754db5612db865cc85921b4052 (diff) | |
ext/ffmpeg/gstffmpegdec.c: Disable parsing on h264 for now, seems to break avc decoding.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open),
(gst_ffmpegdec_handle_event), (gst_ffmpegdec_register):
Disable parsing on h264 for now, seems to break avc decoding.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2005-06-03 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open), + (gst_ffmpegdec_handle_event), (gst_ffmpegdec_register): + Disable parsing on h264 for now, seems to break avc decoding. + +2005-06-03 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * configure.ac: scale requires -libs (video.h). * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps): diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 437cc63d1c..8b513be709 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -403,7 +403,8 @@ gst_ffmpegdec_open (GstFFMpegDec *ffmpegdec) * of $(see mpeg4)... */ 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_MP3 && + oclass->in_plugin->id != CODEC_ID_H264) { ffmpegdec->pctx = av_parser_init (oclass->in_plugin->id); } @@ -875,7 +876,8 @@ gst_ffmpegdec_handle_event (GstFFMpegDec * ffmpegdec, GstEvent * event) avcodec_flush_buffers (ffmpegdec->context); if (ffmpegdec->context->codec_id == CODEC_ID_MPEG2VIDEO || - ffmpegdec->context->codec_id == CODEC_ID_MPEG4) { + ffmpegdec->context->codec_id == CODEC_ID_MPEG4 || + ffmpegdec->context->codec_id == CODEC_ID_H264) { ffmpegdec->waiting_for_key = TRUE; } } @@ -1138,6 +1140,7 @@ gst_ffmpegdec_register (GstPlugin * plugin) switch (in_plugin->id) { case CODEC_ID_MPEG4: case CODEC_ID_MSMPEG4V3: + case CODEC_ID_H264: rank = GST_RANK_PRIMARY; break; default: |