From patchwork Sat May 29 09:35:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1254788iof; Sat, 29 May 2021 02:36:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGnE8KgDsLzRbCVKHvS7jNflmZbweose7omQ9BEm87tkqgRSF6t79q/yck4phsyN9IncUh X-Received: by 2002:a05:6402:35cc:: with SMTP id z12mr14528447edc.154.1622281012341; Sat, 29 May 2021 02:36:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622281012; cv=none; d=google.com; s=arc-20160816; b=cX63P2Z8RJbYLtEOqNw0m1lbSkqqHVGWGtI0HkzB8Okr57sEXx7Q1jHD8V2Cs42di3 xfONjJ4NkrutN3cLK0n6nl2sSDAGJGNh4abHF/XQToR6GEYAnUn6c+x+di1DcZgO+9Hx njvp4K7a426zX2/XH5EwE20/A+vMIfIPkjSriDCvdpWV0i3/ZHGOPfTYWNbC212x4eT0 MYS74Xe3Y6WhPz/1gwnxf3yFimVLy9RYX9y2GWuNj+vH3OD89mKNiIa/ym5k09D6l7jP gr5uTkZafySL3xm1EHROae9qOuIAIotq23AXfvSj8KL6gnEAGUat7r8IwgCI1yJ5rXP3 LSdQ== 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:message-id:date:to:from:delivered-to; bh=8M/7Eqj0Oliej53PZLa1fCqLKhVVqpbVYRZbhYmcexU=; b=wZrMOHrKSqPUFK8f0+aanQs6WlJ0Jji0NYCtuwRJltrACpPHDpfvwbE1x0Q1KfR83J c5WjwdRlTqUzUO0OPkPY2W9L+hIkIjih57PXd4RsudrBrP3lwwLbopV5QcHwcATCPhRu uRTk+zH6S6LtMrJXGO4t1Y3qb38UqukFaGECNwpZVGkv/M40pXo5g3BMPLmAM18wpgb9 1kREB3/tupMBa9ukXL+6jP5gCEZ3aUxi1WKZF+rzdSrbtNTLJGjeCfUkj+49V6394V0N LJsz/EhInIzZDLw0+KJJnzvyl4vg30XHK/MX2xVJRwnq133boj00H9yJmvU8FsocRIwa DUGg== 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 o20si7383979edr.268.2021.05.29.02.36.52; Sat, 29 May 2021 02:36:52 -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; 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 A3DAE68020E; Sat, 29 May 2021 12:36:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3678B687F17 for ; Sat, 29 May 2021 12:36:31 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lmvOQ-005rqY-0J for ffmpeg-devel@ffmpeg.org; Sat, 29 May 2021 11:36:30 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mvNSlDP3qljeHmvNSlLQEJ; Sat, 29 May 2021 11:35:30 +0200 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=BoHjPrf5 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=NFwcUnkKh_PaUWckC38A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 May 2021 11:35:28 +0200 Message-Id: <20210529093530.15419-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfA14aINybRCcwZg1hx77mKCXIuwxzkNEHo85xoD8OSWujjOA8ORDfadMVohLgRihAOd8L7UxAPF7j8J4DpKuksxFXSKm8U593RKB7cwrRqUWo0wfgH2U dc2bgMtK7XSq0xtGdUORo+al1RDsFCK/AJBQ1E+bAUOrd81SCYBg0e8p Subject: [FFmpeg-devel] [PATCH 1/3] avformat/movenc: Check pal_size before use 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: OCZRv/5Wpp69 Fixes: assertion failure Fixes: out of array read Fixes: Ticket8190 Fixes: CVE-2020-22015 Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2ab507df15..7d839f447b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2160,11 +2160,13 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex avio_wb16(pb, 0x18); /* Reserved */ if (track->mode == MODE_MOV && track->par->format == AV_PIX_FMT_PAL8) { - int pal_size = 1 << track->par->bits_per_coded_sample; - int i; + int pal_size, i; avio_wb16(pb, 0); /* Color table ID */ avio_wb32(pb, 0); /* Color table seed */ avio_wb16(pb, 0x8000); /* Color table flags */ + if (track->par->bits_per_coded_sample < 0 || track->par->bits_per_coded_sample > 8) + return AVERROR(EINVAL); + pal_size = 1 << track->par->bits_per_coded_sample; avio_wb16(pb, pal_size - 1); /* Color table size (zero-relative) */ for (i = 0; i < pal_size; i++) { uint32_t rgb = track->palette[i]; From patchwork Sat May 29 09:35:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1254704iof; Sat, 29 May 2021 02:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+m5lLlundBE3IL6wnzeqPZGMEZhPHrz7CM2833gcMl9SaNQ3zHJXVkZ4yuxx/yv0QWAg0 X-Received: by 2002:a17:906:1997:: with SMTP id g23mr13350459ejd.168.1622281002990; Sat, 29 May 2021 02:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622281002; cv=none; d=google.com; s=arc-20160816; b=bYhoSXLPJiDG/oBAilNTIL/QC8afV/n91U2YlBnrUL4tv4emWuujKet32neaot0T+u 7MMPmz67a5JOmF8LftnZsILgtj4CF45SxV7nO27r6fkuzgWkEZXSvaYB5bqLXQJtfgKg Xc8OwhIJJVtIjY/KEhjBAybJxUcMrbX2fvYhcEc7/yKTYWRdfDMbsjUrGQvYwf0oy7X9 suLGyzscj9lKjrCZB62/NZlZp4T+o1lRTixdS3ePLYlHszZg4Ls5juetlVUR3shssgfu GWfK1B4acjBwAdZsG+ji12vi4E1f2dYHPJrumIHu5XmSkgDkuh+4ulXcnQA1jYZ/aB9p FO4w== 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=rbrzHSCR3jVutH3Zj8xUPbv7bsErpiI3The0Q+9WBDg=; b=HAeiuVfnQ2khL7Gj6ETS7sEkaC4kkGaNExxAXstHSFqXlajgbclJeodLFxAWl7M2Y3 ODkYkZn5+7ep1Edo6ohYximJnOU47VjaSfID+GbgvoAYngKkAI3w8CaJ3mr0Q/8wS1PZ 6BRcnO9QFeAwGpaWgcTKIftZosTLjMlvdldFiv50mEdQk3Y+H9/YQR7l5F8RpU2wduyx sxj9apHgLmPVC3loHoPrPoNeQNVRrJqV6bW1ZRaVwTMCVw2pWippDobLkm0gfGigJX+F 3vs4r1ixpqNsViaadghlza9ivrSEFx+/WNvucdruV0odnQCwHeYSJbcYfC1YY9ZK4/C7 EhFA== 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 jg40si6986818ejc.465.2021.05.29.02.36.42; Sat, 29 May 2021 02:36:42 -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; 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 742FE688178; Sat, 29 May 2021 12:36:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37EC668803D for ; Sat, 29 May 2021 12:36:31 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lmvOQ-005rF2-0C for ffmpeg-devel@ffmpeg.org; Sat, 29 May 2021 11:36:30 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mvNSlDP4LljeHmvNSlLQEU; Sat, 29 May 2021 11:35:30 +0200 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=BoHjPrf5 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=QxMUGsJoJTC3VKdc9MUA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 May 2021 11:35:29 +0200 Message-Id: <20210529093530.15419-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210529093530.15419-1-michael@niedermayer.cc> References: <20210529093530.15419-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfA14aINybRCcwZg1hx77mKCXIuwxzkNEHo85xoD8OSWujjOA8ORDfadMVohLgRihAOd8L7UxAPF7j8J4DpKuksxFXSKm8U593RKB7cwrRqUWo0wfgH2U dc2bgMtK7XSq0xtGdUORo+al1RDsFCK/AJBQ1E+bAUOrd81SCYBg0e8p Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_vmafmotion: Check dimensions 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: asjhrtaRzxk2 Fixes: out of array access Fixes: Ticket8241 Fixes: Ticket8246 Fixes: CVE-2020-22019 Fixes: CVE-2020-22033 Signed-off-by: Michael Niedermayer --- libavfilter/vf_vmafmotion.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 2db4783d8d..454ebb8afa 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -238,6 +238,9 @@ int ff_vmafmotion_init(VMAFMotionData *s, int i; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + if (w < 3 || h < 3) + return AVERROR(EINVAL); + s->width = w; s->height = h; s->stride = FFALIGN(w * sizeof(uint16_t), 32); From patchwork Sat May 29 09:35:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27980 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1254848iof; Sat, 29 May 2021 02:37:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBpZAygiy/Xd39iPdfshr1U2gJAvRwamfNZqqpjFHFx7tMEsePiJsw4KUPsdmTs4Ltc4Ms X-Received: by 2002:aa7:cc19:: with SMTP id q25mr14386723edt.56.1622281020970; Sat, 29 May 2021 02:37:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622281020; cv=none; d=google.com; s=arc-20160816; b=luV++nsS0sdoQVgOL2+AwGFGpxDdKRR2zwH2EyWgGk6ElXiwOHdnZQn57WSvpPxh1n c1Fz7L6INdqjc0rSKz3BzGyTWLS/b9nfc93x7iSEVdC5F38l3Gq2N8v52AzLIZ/cjkhu iS+EccCB/4Zi+tnzMS9tUAAaePDP1eowZ2br2j9BZSVB8E+K2vRBk8n7fNwp5DL4FR9j /wSvAHY5OlPHnHMMuufw1LdEd5jPa+b9q3kPM+LDZlIYDgOWzpB7A6cewtmGj5hc0N6x L71eYwclybZmxRi8AEGn3cwp5zcf1xGmRwkPQCwv7ViZm8smQlbyv5KnOBXj7dDj60Zb Iecw== 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=ECV023JKtOJ4IehdzF8W0/AEJwS19+9hOm7n4U6nS7A=; b=EVvyEXOfflxxWlWUHMvo8myzE4ZzqbnXX1TYhn1bbeQN3KmxxlVjO5MMAIOyJZRogV eU0+9avOaxRiYQMo0PZ7ygC+9DgE3dPhs4+iNiQbsf5Q2yHkQwDSIQL8Jd/MMxIaoDrk k0udHYPJukHEDrkDUloWuLi3SYc478cCtzJObdQBbtoxvtzOaNIXgvJ6Ca6XbJzmiwtN Yp37mLAqniioy9u67AIv8eEdRz0CA4ajf8cIc6uTTuVizqFLxtGjp1o+xsL1yKpZdkBw 3yaXfRkAgQQO073ZDlF0I+3OTV7iiP2RueiU6EfQnyl3szosrSKZb6Kf9ZF48+s4316R vjPA== 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 x16si7103750edd.495.2021.05.29.02.37.00; Sat, 29 May 2021 02:37:00 -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; 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 929B16881D0; Sat, 29 May 2021 12:36:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 390DF688068 for ; Sat, 29 May 2021 12:36:31 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lmvOQ-005rF3-0C for ffmpeg-devel@ffmpeg.org; Sat, 29 May 2021 11:36:30 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mvNSlDP4UljeHmvNSlLQEY; Sat, 29 May 2021 11:35:30 +0200 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=BoHjPrf5 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=NciFQ88WW5TS_6HtbcAA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 May 2021 11:35:30 +0200 Message-Id: <20210529093530.15419-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210529093530.15419-1-michael@niedermayer.cc> References: <20210529093530.15419-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfA14aINybRCcwZg1hx77mKCXIuwxzkNEHo85xoD8OSWujjOA8ORDfadMVohLgRihAOd8L7UxAPF7j8J4DpKuksxFXSKm8U593RKB7cwrRqUWo0wfgH2U dc2bgMtK7XSq0xtGdUORo+al1RDsFCK/AJBQ1E+bAUOrd81SCYBg0e8p Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/vf_yadif: Fix handing of tiny images 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: MTk4X04vDNtn Fixes: out of array access Fixes: Ticket8240 Fixes: CVE-2020-22021 Signed-off-by: Michael Niedermayer --- libavfilter/vf_yadif.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 91cc79ecc3..b0d9fbaf1f 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -123,20 +123,22 @@ static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1, uint8_t *next2 = parity ? cur : next; const int edge = MAX_ALIGN - 1; + int offset = FFMAX(w - edge, 3); /* Only edge pixels need to be processed here. A constant value of false * for is_not_edge should let the compiler ignore the whole branch. */ - FILTER(0, 3, 0) + FILTER(0, FFMIN(3, w), 0) - dst = (uint8_t*)dst1 + w - edge; - prev = (uint8_t*)prev1 + w - edge; - cur = (uint8_t*)cur1 + w - edge; - next = (uint8_t*)next1 + w - edge; + dst = (uint8_t*)dst1 + offset; + prev = (uint8_t*)prev1 + offset; + cur = (uint8_t*)cur1 + offset; + next = (uint8_t*)next1 + offset; prev2 = (uint8_t*)(parity ? prev : cur); next2 = (uint8_t*)(parity ? cur : next); - FILTER(w - edge, w - 3, 1) - FILTER(w - 3, w, 0) + FILTER(offset, w - 3, 1) + offset = FFMAX(offset, w - 3); + FILTER(offset, w, 0) } @@ -170,21 +172,23 @@ static void filter_edges_16bit(void *dst1, void *prev1, void *cur1, void *next1, uint16_t *next2 = parity ? cur : next; const int edge = MAX_ALIGN / 2 - 1; + int offset = FFMAX(w - edge, 3); mrefs /= 2; prefs /= 2; - FILTER(0, 3, 0) + FILTER(0, FFMIN(3, w), 0) - dst = (uint16_t*)dst1 + w - edge; - prev = (uint16_t*)prev1 + w - edge; - cur = (uint16_t*)cur1 + w - edge; - next = (uint16_t*)next1 + w - edge; + dst = (uint16_t*)dst1 + offset; + prev = (uint16_t*)prev1 + offset; + cur = (uint16_t*)cur1 + offset; + next = (uint16_t*)next1 + offset; prev2 = (uint16_t*)(parity ? prev : cur); next2 = (uint16_t*)(parity ? cur : next); - FILTER(w - edge, w - 3, 1) - FILTER(w - 3, w, 0) + FILTER(offset, w - 3, 1) + offset = FFMAX(offset, w - 3); + FILTER(offset, w, 0) } static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)