Commit b4330a0e authored by James Almer's avatar James Almer

avformat/concatdec: fix the h264 annexb extradata check

The start code can be either in the first three or four bytes.
parent 91f8ccdd
...@@ -199,8 +199,11 @@ static int detect_stream_specific(AVFormatContext *avf, int idx) ...@@ -199,8 +199,11 @@ static int detect_stream_specific(AVFormatContext *avf, int idx)
AVBitStreamFilterContext *bsf; AVBitStreamFilterContext *bsf;
int ret; int ret;
if (cat->auto_convert && st->codecpar->codec_id == AV_CODEC_ID_H264 && if (cat->auto_convert && st->codecpar->codec_id == AV_CODEC_ID_H264) {
(st->codecpar->extradata_size < 4 || AV_RB32(st->codecpar->extradata) != 1)) { 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, av_log(cat->avf, AV_LOG_INFO,
"Auto-inserting h264_mp4toannexb bitstream filter\n"); "Auto-inserting h264_mp4toannexb bitstream filter\n");
if (!(bsf = av_bitstream_filter_init("h264_mp4toannexb"))) { if (!(bsf = av_bitstream_filter_init("h264_mp4toannexb"))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment