From patchwork Fri Dec 17 21:51:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 32696 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1993290iog; Fri, 17 Dec 2021 13:53:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJzr+UWq4X854Zklfn/2O+bSeCqlonaGnebW1vd2HlSlnNJBPknMPP9w/9pBZLRxDmF7tQ70 X-Received: by 2002:aa7:cb1a:: with SMTP id s26mr4691949edt.19.1639777986074; Fri, 17 Dec 2021 13:53:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639777986; cv=none; d=google.com; s=arc-20160816; b=yUmhQHXJCyjULZDfFmA9niy5sTwGzJxvJuV1KYT/YpEZWWIJkuoL+cyCyCHTaMrzY5 uWqqvsngQnosLPaXV+L1Q97Lg6bWkFr0pAM5EfWHZ1iNtKIm+XVQWe77UtAjUEzdEfZB jRD/80Cmb2PYmP15Kd9dX5ZXF3eDFijSKconT+mhQwmztYlgfsBLACHCiZu+3WZHFc1e aXkQqouQH4rU2tFjWuNdxoNVt2ySlEOLhT5F0jDae96Yby8zSSQd+wGQJgHK0mFoy7b2 hQ1KniwTdkeAXlrt7FLVXuwD97EBpXQXx/ev+EqnpR4GrCDoIBjaKe2agJZJBgFqc9xO QnBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=vBZuYII4OMMgnBsXER5S23Ja9fweDrQGDe2NFghdmKQ=; b=JgdjpgwRiuqe0ukfpUukrgZYTpmsQ5IIrEr+ei/ah8iG1DBGL5TuS/r9Bqa+ALmJkT 7/gejqegETBcuWy6eaZOUVjvY5xAXFRPpgrshtU6lrX3KQ8JkeETUJ1cyHYdCqfc0IkT Yg/1LYUcuExO2Can+0wi4qgfcq8HUdSCwreiW6C0AdfgZBFuJgrxjB0BR52KYOZY9s2p wmTg9LQwT2KF/SNK7gAKj07iXvbTTXyT2wsiqK65Nu5QL9SaDTYCCz7+N3F7fnWnyDnk quDN0gpRtLyK/sUnm3wxMGjlY+tzz9hWQ/kIag/AWaW9PKUdIGhlPA2NGmdvs7wv4B0D 5pbQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w12si7113381edj.155.2021.12.17.13.53.05; Fri, 17 Dec 2021 13:53:06 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 898B568AF36; Fri, 17 Dec 2021 23:53:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7C80680529 for ; Fri, 17 Dec 2021 23:52:56 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1myL9s-007QX4-0I for ffmpeg-devel@ffmpeg.org; Fri, 17 Dec 2021 22:52:56 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id yL8umhDvvSgGFyL8umiq3N; Fri, 17 Dec 2021 22:51:56 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=KrFz3_f-UZ3I1SuuC50A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Dec 2021 22:51:54 +0100 Message-Id: <20211217215155.19805-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211217215155.19805-1-michael@niedermayer.cc> References: <20211217215155.19805-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMAoYyTrjuUg7QHZnG9okvJUHGZLH2I1zraPZsKMnDCTFwTa4dg4qsVu2oZdPzjaPfOCL9Z6UcviVoSB8SmK+F+hK54Fd/yt9Hedh5bqFEmuESuHcz1T 5JzUbxFetGrhAfo6f/DY7eLw7e2h3E/2ZbYQ17OiPwnIzo2hs5hxWSmp Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/tiff: Pass max_pixels to mjpeg context 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9YXN9uCqQbZ4 Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 870e0666aa3..9af602eef70 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2155,6 +2155,7 @@ static av_cold int tiff_init(AVCodecContext *avctx) s->avctx_mjpeg->flags2 = avctx->flags2; s->avctx_mjpeg->dct_algo = avctx->dct_algo; s->avctx_mjpeg->idct_algo = avctx->idct_algo; + s->avctx_mjpeg->max_pixels = avctx->max_pixels; ret = avcodec_open2(s->avctx_mjpeg, codec, NULL); if (ret < 0) { return ret;