ffmpeg | branch: release/3.2 | James Almer <jamr...@gmail.com> | Tue Apr 25 20:23:12 2017 -0300| [49279d4cc2c7e4c6354755625a0653f5d46c4fff] | committer: James Almer
avformat/concatdec: fix the h264 annexb extradata check The start code can be either in the first three or four bytes. (cherry picked from commit b4330a0e02fcbef61d630a369abe5f4421ced659) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49279d4cc2c7e4c6354755625a0653f5d46c4fff --- libavformat/concatdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 5cc239a1b6..3d843173e8 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -199,8 +199,11 @@ static int detect_stream_specific(AVFormatContext *avf, int idx) AVBitStreamFilterContext *bsf; int ret; - if (cat->auto_convert && st->codecpar->codec_id == AV_CODEC_ID_H264 && - (st->codecpar->extradata_size < 4 || AV_RB32(st->codecpar->extradata) != 1)) { + if (cat->auto_convert && st->codecpar->codec_id == AV_CODEC_ID_H264) { + if (!st->codecpar->extradata_size || + (st->codecpar->extradata_size >= 3 && AV_RB24(st->codecpar->extradata) == 1) || + (st->codecpar->extradata_size >= 4 && AV_RB32(st->codecpar->extradata) == 1)) + return 0; av_log(cat->avf, AV_LOG_INFO, "Auto-inserting h264_mp4toannexb bitstream filter\n"); if (!(bsf = av_bitstream_filter_init("h264_mp4toannexb"))) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
