From patchwork Fri Apr 14 19:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41193 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp748099pzb; Fri, 14 Apr 2023 12:35:25 -0700 (PDT) X-Google-Smtp-Source: AKy350ZBwARgJZTLUaQ55F8Bicy0Hn/P7yrdKNXzPNdzZsaMDuRex5XgtwjadfkfyWpPj/l5SvMC X-Received: by 2002:a17:906:264c:b0:94e:e78a:3940 with SMTP id i12-20020a170906264c00b0094ee78a3940mr299874ejc.0.1681500925729; Fri, 14 Apr 2023 12:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681500925; cv=none; d=google.com; s=arc-20160816; b=bsrMn1Ea7XuDzzfgDJgOVsGVkCZmiDy1LfZpHZsXh+PIvq1EF0WBVLSOilvg4UUgbR xxA9sW931PEpOQz3ekN/0FJdR/YkIpQjg1vx0zDIAc/GYI9nvHn1eHD4/bU07dMjxqfo 75VHcIsvLWCaWgh1IkkyF1YBPGA+qgo6MhKst1vuNIUSwf9Zo0Hn//e1ovTCBs9e70Yc K9TBXGOBfSREoTHe0qQFPUEg17gZsfylPY2ZO6TbISjwwxdiJDvkvYdB3/dToP8dexkG BplOYNbyBjZBPUfQuw/Ug/et2VZPgNBisC8uVHtgVp73VysKxE0Y8F9XUsf0ZUEoJ6p5 u3uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=GlpOjYxI+YE7zf2t9PIgrIFLJl4NU3AvWXpYigrSHgM=; b=vfEnuh4SNuiBVORaeIIUbR5FIT4NmyDjR3eB/JSbN6I/XHDRPESAtOYxoRG39A/rbP MqWLo0l0EyUdt2YL/NzPRE9d7MlFIcyNaGrZke4rWGQkqFdL06NABa5URwOEy7B1eUmA t5dTlXX3TtqguSV6hsmrsoNCsUjSlAwXl1bODVa6EDoHMcfvZCh3KfUcWoK3wOBB4Pk+ KsztjoG8/rT4VK6cXRtsXWk2iYee45AMcRduP1I7EdhAVCOETi2EAHZS2/1DTh/+rW7b lqaOrLgcSncqPE+DA20bCOgGySu5JVSydko8qxydXpGmLVBUVXdPfVDjVJfVkxX/DHsS Y6Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ORe+0OVD; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k13-20020a1709063e0d00b0093e6f520acesi5240025eji.832.2023.04.14.12.35.25; Fri, 14 Apr 2023 12:35:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ORe+0OVD; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 419DD68BF27; Fri, 14 Apr 2023 22:35:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 861E268A8CB for ; Fri, 14 Apr 2023 22:35:20 +0300 (EEST) Received: by mail-oi1-f173.google.com with SMTP id bh10so12842856oib.1 for ; Fri, 14 Apr 2023 12:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681500919; x=1684092919; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Ka1vu0/Pf+ira9irbe/Rw+QIz8uO89V3BSNfpOTEjhM=; b=ORe+0OVDr0Ua2uyp2vdV1vQQYM3ZhNNP24VmMeJw1aSOgat5xZvaWYVRyG6Xw1jDRX VqsJyfWmJLtgYCbSnATaE2b3fDkFL6Y3DAV2QdP7YbNrNFqHshy7SsNm3WuMWU+8oqb3 SDz9c038jFr3FANazpL5g48xn55Nv6QOdTxHBwGEbU6hIruVeV2sNhmDwTbUwObh1CJb giUvZP0iY21hdH9OfFepOGghYzgVE+/ydpdGKToegTaf8rOF/53caYtJ3vyrKeMio0lI f+diA8Do6eK5xSulexbHStIEmOl5Qb65CpfIztH84vV/EULPCcLjAeoBqfzcPQyehxij xBIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681500919; x=1684092919; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ka1vu0/Pf+ira9irbe/Rw+QIz8uO89V3BSNfpOTEjhM=; b=XzKyspFXX+cpPO8bGIaffZtRuyvZHQGNhjRhs/mS4I5W1R7bJzRluj7mgb7t/x3r84 nEvM2NNV88h8hEAn27bOkOWeZp/+YoZqEMpAsXUEzD4PsG4KCaQiBjlLukVvQ7q36gVa zaeFBd3flfKIJWwMA7ZD3tXXtdxaA5aaD5S6uEz5Z1HH7k77btq+8CJgVfhMmpNhRpE9 VMTCjjQ0ZXhsV4gLYTr4PI4vKcjHGZZprgMD51MrmxbtHxjKcW0/uyaNJaQ0LbpHJvzp ojFHeV1HpNJv0GOgRP+YMOgh/zYXYnw6ruyhpCtjBgdVJ6rGmrLPjE/TrpJDH7UxiwXR lpvA== X-Gm-Message-State: AAQBX9dhrN0SEsZkFDfCMbwNdKnFXU+Wpj8v6REEKZHQ9CMfqXofPekD U3tNZLf7Zs8IpzvD23cR0BMVp/vUszQ= X-Received: by 2002:a05:6808:30f:b0:35e:9090:2969 with SMTP id i15-20020a056808030f00b0035e90902969mr3522572oie.13.1681500918710; Fri, 14 Apr 2023 12:35:18 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 2-20020aca1002000000b0038b0dd1c040sm1949424oiq.3.2023.04.14.12.35.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 12:35:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Apr 2023 16:34:54 -0300 Message-Id: <20230414193454.3538-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: ensure lmin is smaller than lmax X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DANwoAd+CdBM Fixes ticket #10234 Signed-off-by: James Almer --- 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)