diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-25 20:23:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-17 16:57:38 -0300 |
| commit | 30415662ef7a4d8f3a2bffd2a8c05a801b42a279 (patch) | |
| tree | e6e9aef7d3802b89257b87cbe0f0902a5a64713f | |
| parent | c54a76bf714b07cf316da06ffeac1a1d753a15f3 (diff) | |
| download | ffmpeg-30415662ef7a4d8f3a2bffd2a8c05a801b42a279.tar.gz | |
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)
| -rw-r--r-- | libavformat/concatdec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index de7b89a28f..9c7484eb95 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -193,8 +193,11 @@ static int detect_stream_specific(AVFormatContext *avf, int idx) ConcatStream *cs = &cat->cur_file->streams[idx]; AVBitStreamFilterContext *bsf; - if (cat->auto_convert && st->codec->codec_id == AV_CODEC_ID_H264 && - (st->codec->extradata_size < 4 || AV_RB32(st->codec->extradata) != 1)) { + if (cat->auto_convert && st->codec->codec_id == AV_CODEC_ID_H264) { + if (!st->codec->extradata_size || + (st->codec->extradata_size >= 3 && AV_RB24(st->codec->extradata) == 1) || + (st->codec->extradata_size >= 4 && AV_RB32(st->codec->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"))) { |