ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/concatdec: fix the h264 annexb extradata check

Browse Source 
The start code can be either in the first three or four bytes.

(cherry picked from commit b4330a0e02)
This commit is contained in:
James Almer 2017-04-25 20:23:12 -03:00
parent c54a76bf71
commit 30415662ef
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/concatdec.c
View File

@ -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"))) {