diff options
| author | Marton Balint <cus@passwd.hu> | 2023-06-25 20:38:32 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2023-07-06 21:08:57 +0200 |
| commit | 4e27b485d7924dfa4600c978863b1d84f1fc317b (patch) | |
| tree | 5d8ca72d9d1cd8b4d53b63d4fcb5c5d5aec77907 | |
| parent | b7f4d5fa7e04498fddd60d298bc4a95241a581da (diff) | |
| download | ffmpeg-4e27b485d7924dfa4600c978863b1d84f1fc317b.tar.gz | |
avcodec/mpeg12dec: ignore picture start code in extradata for AVID mpeg2 files
AVID IMX MPEG2 files in MOV seems to have extradata like this:
00000000: 0000 0018 4143 4c52 4143 4c52 3030 3031 ....ACLRACLR0001
00000010: 0000 0001 0000 0000 ........
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavcodec/mpeg12dec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 27c862ffb2..27b45c6fc4 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2522,6 +2522,11 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, } picture_start_code_seen = 1; + if (buf == avctx->extradata && avctx->codec_tag == AV_RL32("AVmp")) { + av_log(avctx, AV_LOG_WARNING, "ignoring picture start code in AVmp extradata\n"); + break; + } + if (s2->width <= 0 || s2->height <= 0) { av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions %dx%d.\n", s2->width, s2->height); |