From patchwork Fri Feb 28 21:06:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17966 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D502E44B721 for ; Fri, 28 Feb 2020 23:06:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B866B68B1A2; Fri, 28 Feb 2020 23:06:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4ACF68B06C for ; Fri, 28 Feb 2020 23:06:37 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p9so4774459wmc.2 for ; Fri, 28 Feb 2020 13:06:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=42g7VruAcqUmTrh7eXmKl4KzdZuo3w7wWD9A2f9TvCU=; b=XH8GD/skxY50gf+oHwtaDpLRopymW9Lz742Z5on4pNQYV4dBfQ03scQK+yUplKpwkP XWOr2L6EUWmgc9KV9wgPQx0oOoEprdzBEONbAVVZnVXmrQ551vhlE3KJ2qShGmiJ6/fa NtbC8Yxftzoo2m6h6N5CqcPn065ayef/GrGacmVWYLgE5iaH7P252L++ewjELEzouHzQ xZPdWPM1VJKRzvRMrO9ro/dVmJ+hZVn/LQ2aH9U+WqPlrpi0Kpj/F5EnIhEHyCkBUUqC m/oqVLigwad2Lv1dR63Ypsw2ImzABuMNVWJ+yvQ4fm1ks11X5sPzmpl8ui3zRPXuYsAZ s4RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=42g7VruAcqUmTrh7eXmKl4KzdZuo3w7wWD9A2f9TvCU=; b=GRvxlP2v0sLOQbD1ughmcF4L5AHBiQxzQTb7rVP5C+QJ/uPj9aYkPpezNxJmhMdZTR AeZTpSdhCTw7zzgkmq0mUlL5N5yVZILE02Qru9OPU5g59IerfqETG2YK7hh4ZVgZ7rKT EMJS3SyOBI7CTRUTfy+i8tbgLwl2Ti5MIIX5qohfVWulP4YH3cM4gFW8h8BuGZxJiE7y FwXRBX4X7deo0crQe/Bdj5utY0OlBwYNVqsdy7/mF/JLZUBuriSvMeXJoLImo2qZxAi5 sUiicEZoJtMXlNJFLoF+adumKj+JMZrlHS+7Gs8fMEJ7X2v8sjRAC2NViQvlUUvqE4tI qJ+A== X-Gm-Message-State: APjAAAUVzx9ne8lZvQhhlqEbkuedwZmYSVZqVv+/Hc4bZArr9Q54KbPF OW3ffC3x5zbH/0Ssq/6PkbijyqpN X-Google-Smtp-Source: APXvYqxClKRVyEDeYOh83qNzjbNTLiu9Puw3X/pt89dAbC23V58n3YQAu0xHAkrryWghRD0k36NsCg== X-Received: by 2002:a1c:66d4:: with SMTP id a203mr6499699wmc.188.1582923997085; Fri, 28 Feb 2020 13:06:37 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id a9sm3880865wmm.15.2020.02.28.13.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 13:06:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 22:06:29 +0100 Message-Id: <20200228210631.19477-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fftools/ffmpeg_opt: Fix leak of options when parsing options fails X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #8094. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 12d44886ee..3bf90bd20c 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3278,6 +3278,7 @@ static int open_files(OptionGroupList *l, const char *inout, if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Error parsing options for %s file " "%s.\n", inout, g->arg); + uninit_options(&o); return ret; } From patchwork Fri Feb 28 21:06:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17967 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C4FE544B721 for ; Fri, 28 Feb 2020 23:06:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B37DE68B255; Fri, 28 Feb 2020 23:06:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1944968B154 for ; Fri, 28 Feb 2020 23:06:53 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id v2so4568420wrp.12 for ; Fri, 28 Feb 2020 13:06:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GEOotN9A6tdKUdgCBfPeozwQeEj29Jwbnqnq5K/hw1c=; b=U/8QyYfJb+x6SVS1o5oOoAxmhfYvckqE34at4oAN10x66OcHTmajCV6lm2vekoVwGe /nSvv22xSUPRpmdf4czyTPCZVe0YgGWXwwR84I9mCIZ2OJSyO5hseMk+x7Cxuxb5PAcX J1Ot9VS+w86erxr8QZOasH9TP2ycXtZFOHOtCfb6lcVB7Hz4onKpa2sdMrIF2bueWTH6 DEKt0syURKfJeXB+0hOHFFVFn/SWrR82Ft6es8NI+IvE4vfDMb7AnzERMtVb4/wQ0/wA 1P8hJsQmv9RYvQjsUIGCJZhwUbMCqKbRRP8HK3m7HK8Fne+L9Ser040/3CD2XAy9nEo3 vzkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GEOotN9A6tdKUdgCBfPeozwQeEj29Jwbnqnq5K/hw1c=; b=Vf2n1lMY+RBZZ8ePA7GIu9NcJpGEYgOSKloi/qr+/lXNPvkQWKkKADnGHel/AI/3SO Fqfqgu1i5pUbjZ3QdkF7IPlFq1N6+cPnEpdD1M+wIy70rH7O6nH7c0GW3BSWWlPYxa+u wWGi1u9NdXPo1nbAgyhapLYvnwcPTVljC3JpcPF4ydemJ09hfEaoy5eBOLAh73VHoH3c EK497zGXZxWmgnplgGnPCrrwBjOCYBu9HAHtNMuSLl3cJOxc1c+PKjzi9QHr/jFpHD/G Jx/uQ/klJwG2XnrlMgb6EiBXjpYeOU63FzL82EIOfQkrJnUI4krSDK5DnReCmLVsLYgK l8uw== X-Gm-Message-State: APjAAAWL8fq090Qq7M/yCTMiA18yih0DCnZsNrgj+K3vv81Uara9JAfW hD2KMA56JaoUSydNYikKQEzGbelS X-Google-Smtp-Source: APXvYqwRa+O9xfa2mJZmnKn+GvLO18cvZ09lBqZzO+tytENrRvYm2YjaHhJMVqaG4o8gvYkp5xVabw== X-Received: by 2002:adf:fc08:: with SMTP id i8mr6628130wrr.104.1582924012248; Fri, 28 Feb 2020 13:06:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id a9sm3880865wmm.15.2020.02.28.13.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 13:06:51 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 22:06:30 +0100 Message-Id: <20200228210631.19477-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228210631.19477-1-andreas.rheinhardt@gmail.com> References: <20200228210631.19477-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_cas: Remove superfluous ; X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The second ; in a double ;; is actually a null statement. It triggers the typical declaration-after-statement compiler-warnings if it occurs in the middle of several declarations (like here). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_cas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_cas.c b/libavfilter/vf_cas.c index a07d51a84e..7c32ed5f9b 100644 --- a/libavfilter/vf_cas.c +++ b/libavfilter/vf_cas.c @@ -58,7 +58,7 @@ static int cas_slice8(AVFilterContext *avctx, void *arg, int jobnr, int nb_jobs) const int linesize = out->linesize[p]; const int in_linesize = in->linesize[p]; const int w = s->planewidth[p]; - const int w1 = w - 1;; + const int w1 = w - 1; const int h = s->planeheight[p]; const int h1 = h - 1; uint8_t *dst = out->data[p] + slice_start * linesize; @@ -125,7 +125,7 @@ static int cas_slice16(AVFilterContext *avctx, void *arg, int jobnr, int nb_jobs const int linesize = out->linesize[p] / 2; const int in_linesize = in->linesize[p] / 2; const int w = s->planewidth[p]; - const int w1 = w - 1;; + const int w1 = w - 1; const int h = s->planeheight[p]; const int h1 = h - 1; uint16_t *dst = (uint16_t *)out->data[p] + slice_start * linesize;