diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-25 20:23:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-26 21:50:02 -0300 |
| commit | cfca0b91399bfc72218bd47412bc8e57c19742b9 (patch) | |
| tree | 4ed5b68e4e61ad13a6a2f2867a7d2bcb7d915ef3 | |
| parent | da693f8daa62cb76a2aa05021d6c8d53a1b816b2 (diff) | |
| download | ffmpeg-cfca0b91399bfc72218bd47412bc8e57c19742b9.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 8649916ff2..dd52e4d366 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"))) { |