[FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: ensure lmin is smaller than lmax

[FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: ensure lmin is smaller than lmax

[James Almer]

Fixes ticket #10234

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/ituh263enc.c    | 5 +++++
 libavcodec/mpegvideo_enc.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index c30ecad438..97abfb3f45 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -865,6 +865,11 @@ av_cold void ff_h263_encode_init(MpegEncContext *s)
         s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
     }
 
+    if (s->lmin > s->lmax) {
+        av_log(s->avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax);
+        s->lmin = s->lmax;
+    }
+
     ff_thread_once(&init_static_once, h263_encode_init_static);
 }
 
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index bcd2f9ef1d..efd8e63aa8 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -798,6 +798,11 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
                                                 AV_CODEC_FLAG_INTERLACED_ME) ||
                                 s->alternate_scan);
 
+    if (s->lmin > s->lmax) {
+        av_log(avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax);
+        s->lmin = s->lmax;
+    }
+
     /* init */
     ff_mpv_idct_init(s);
     if ((ret = ff_mpv_common_init(s)) < 0)
-- 
2.40.0

_______________________________________________
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/mpegvideo_enc: ensure lmin is smaller than lmax

[James Almer]

On 4/14/2023 4:34 PM, James Almer wrote:
> Fixes ticket #10234
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>   libavcodec/ituh263enc.c    | 5 +++++
>   libavcodec/mpegvideo_enc.c | 5 +++++
>   2 files changed, 10 insertions(+)
> 
> diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
> index c30ecad438..97abfb3f45 100644
> --- a/libavcodec/ituh263enc.c
> +++ b/libavcodec/ituh263enc.c
> @@ -865,6 +865,11 @@ av_cold void ff_h263_encode_init(MpegEncContext *s)
>           s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
>       }
>   
> +    if (s->lmin > s->lmax) {
> +        av_log(s->avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax);
> +        s->lmin = s->lmax;
> +    }
> +
>       ff_thread_once(&init_static_once, h263_encode_init_static);
>   }
>   
> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
> index bcd2f9ef1d..efd8e63aa8 100644
> --- a/libavcodec/mpegvideo_enc.c
> +++ b/libavcodec/mpegvideo_enc.c
> @@ -798,6 +798,11 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
>                                                   AV_CODEC_FLAG_INTERLACED_ME) ||
>                                   s->alternate_scan);
>   
> +    if (s->lmin > s->lmax) {
> +        av_log(avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax);
> +        s->lmin = s->lmax;
> +    }
> +
>       /* init */
>       ff_mpv_idct_init(s);
>       if ((ret = ff_mpv_common_init(s)) < 0)

Will apply.
_______________________________________________
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".