[FFmpeg-devel] [PATCH] avcodec/mpeg12dec: ignore picture start code in extradata for AVID mpeg2 files

[FFmpeg-devel] [PATCH] avcodec/mpeg12dec: ignore picture start code in extradata for AVID mpeg2 files

[Marton Balint]

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>
---
 libavcodec/mpeg12dec.c | 5 +++++
 1 file changed, 5 insertions(+)

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);
-- 
2.35.3

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/mpeg12dec: ignore picture start code in extradata for AVID mpeg2 files

[Marton Balint]

On Tue, 27 Jun 2023, Marton Balint wrote:

> 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                      ........
>

Will apply.

Regards,
Marton

> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavcodec/mpeg12dec.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> 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);
> -- 
> 2.35.3
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".