From patchwork Mon Jan 9 00:59:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2132 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6847060vsb; Sun, 8 Jan 2017 17:00:00 -0800 (PST) X-Received: by 10.223.130.204 with SMTP id 70mr10062334wrc.128.1483923600346; Sun, 08 Jan 2017 17:00:00 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ek8si95205723wjd.74.2017.01.08.17.00.00; Sun, 08 Jan 2017 17:00:00 -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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.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 5AED968A60C; Mon, 9 Jan 2017 02:59:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD1EB6803C9 for ; Mon, 9 Jan 2017 02:59:45 +0200 (EET) Received: by mail-wm0-f41.google.com with SMTP id k184so100351500wme.1 for ; Sun, 08 Jan 2017 16:59:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=glLpMu9ge4hxvcjFExPPc8oK7DRMpm5Fr4AEirv0vXo=; b=i5LAPYajXZONh1ja5QSYX+f+fEOpXiVraboBeaLbo2Srh9ugDGFG4Sje5KVxE6m7J8 9IILkAC/owK0xP3bBzmdL5gxt652Th6DnIOAeKLyY4aQebU5Zy48CmSCpfouCsdg0mAC zs0wMl1z/SPAbbjYxhzXm530JLwkJtcCHxApQ+8V7gZiLbNL5fnRVKO1SfolF7bk1/IK xrQ1or3MaqmWgTFMrlFQbK9SrN7Ii3iepFjMTle7SdPQ9sY1f815mNhmm3qiZeW3dtBL hwUwyHQ+iOyPHqJKkZ1NMjQ6eoTY6YOeRSwdaNMmRKkUT+y7TCmXe4vimfJooDvXBz4Y Ehig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=glLpMu9ge4hxvcjFExPPc8oK7DRMpm5Fr4AEirv0vXo=; b=SZrsXc/odNyOHUO0I33W3/OMfzN72+HyEmF5I55UMM7+SrXJjzLWssjd4kl/cHX4u3 kgll0rh372hd9FGlehFfJTL1B2wE9l7q1s909ld0aucXJ8ejIxh1ak1Vn/f54vK/rCUt o/unGtdFWDNF/pm8E0yIgJB12m/z14ldllmNzGv0nVt5RsDeXap+2ZwPp6MsNNnu70mL A32bH1A0AWhwVpMPpKKsaEr/X9usV47EQx4KbDdMf3mPbrStmTiNlaAPeygqc6SddnA4 zVqkEc+MzBF5T1saAU2YE2DVQRCeQ4wD8TgkFKEmsAvlhum1AyLlLnxDFmvLozwhkr0D bVCw== X-Gm-Message-State: AIkVDXJIDBJBDVXdoeiaXzaqkCdvKWydQY4IMDzhe7rWWvfUWxgTvolKLYGGdz8qd5bpGA== X-Received: by 10.28.185.203 with SMTP id j194mr3159157wmf.73.1483923591953; Sun, 08 Jan 2017 16:59:51 -0800 (PST) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id l74sm16053866wmg.2.2017.01.08.16.59.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 16:59:51 -0800 (PST) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: <0314f93a-477b-a20d-9917-fce24c67f357@jkqxz.net> Date: Mon, 9 Jan 2017 00:59:50 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] vf_scale_vaapi: Add missing return value checks 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- CC libavfilter/vf_scale_vaapi.o src/libavfilter/vf_scale_vaapi.c: In function ‘scale_vaapi_query_formats’: src/libavfilter/vf_scale_vaapi.c:65:5: warning: ignoring return value of ‘ff_formats_ref’, declared with attribute warn_unused_result [-Wunused-result] ff_formats_ref(ff_make_format_list(pix_fmts), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ &avctx->inputs[0]->out_formats); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/libavfilter/vf_scale_vaapi.c:67:5: warning: ignoring return value of ‘ff_formats_ref’, declared with attribute warn_unused_result [-Wunused-result] ff_formats_ref(ff_make_format_list(pix_fmts), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ &avctx->outputs[0]->in_formats); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (Inspired by noting the same issue on vf_deinterlace_vaapi.c.) libavfilter/vf_scale_vaapi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index d1cb246d1f..612d001c42 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -61,11 +61,14 @@ static int scale_vaapi_query_formats(AVFilterContext *avctx) enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_VAAPI, AV_PIX_FMT_NONE, }; + int err; - ff_formats_ref(ff_make_format_list(pix_fmts), - &avctx->inputs[0]->out_formats); - ff_formats_ref(ff_make_format_list(pix_fmts), - &avctx->outputs[0]->in_formats); + if ((err = ff_formats_ref(ff_make_format_list(pix_fmts), + &avctx->inputs[0]->out_formats)) < 0) + return err; + if ((err = ff_formats_ref(ff_make_format_list(pix_fmts), + &avctx->outputs[0]->in_formats)) < 0) + return err; return 0; }