From patchwork Mon Nov 20 09:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 6218 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3650918jah; Mon, 20 Nov 2017 01:07:39 -0800 (PST) X-Google-Smtp-Source: AGs4zMaYGYPD864YzyDCizRasnyz1DBZlQdSp6A0toyp1i6wbIqvyqjVOVfNUYGO8mAQWNyXOYJv X-Received: by 10.28.199.133 with SMTP id x127mr9108631wmf.156.1511168859288; Mon, 20 Nov 2017 01:07:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511168859; cv=none; d=google.com; s=arc-20160816; b=DjVCEkSuNd+xZOrZyXObGBBe5R41XjyX1c4C3GrOYTdl037QvVeGalJhtlyx1Er8Du dup1XKwIRuKD5t6bDJt8Ta2kuZN29i3exeb2GmMEwFYdhWU+qa0xenaanJvXzGQE04il W64Fui2hYAYVZyeJjdtqoRHu451YE21nAFGLkgpw5iq8cR6L7Mcxy02sK+Qy6lwc7mdC FFrCHYsrr7nViOZDgHwM/Sl72bIe69tBjtku9jzA9oxe20XpfsdPZNw8RdhMeyNlXSHr IufQMRXmWSwC3RoSBNlU0R8E4XFy6sv5UNzmrRm5C5hM7lc1bwVuvs+TuCaFfyVX5Jb1 ELBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:to:references:message-id :date:in-reply-to:from:mime-version:delivered-to :arc-authentication-results; bh=XPQGNbvj8PwU7z4lmJqvIHpRD7oQIpfPcl+ra5oQtZQ=; b=u9pep0XxOmlrKsF6PyzZEPpwg4v8dcZqfgsDQAdwPNXKPuAUOd9f5/7l8asMGsgWhE 9c9yPwAR9kDSYxfCVfmX6MZGExo8mofFC6BLhDG12sQD3Ri/9KjymGx/K+lbQIu6kYuG 21jBYxqa2EvBvjK08plR+0VyM5WKaeH1wyCmQag1C5Ukw4XjIpvS+mRGT/mgQsLemjr2 0c0Mwc795nRzhRoC2oHuDSrOT6jINVF7Rvl8UO4SSWP2Qs7wPrXFPwoPkHcAc0nQvdJq g7LpbmNShXlRHOfjUQZvMJNEHiCrxh8Z/8Hqz6T7L1xRukoAWEnkyMT2APxYj5/eSXS1 RlOg== 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 g9si2765582wmc.147.2017.11.20.01.07.38; Mon, 20 Nov 2017 01:07:39 -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 0CC63689CCD; Mon, 20 Nov 2017 11:07:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg202.qq.com (smtpbg202.qq.com [184.105.206.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FE7F689BFE for ; Mon, 20 Nov 2017 11:07:12 +0200 (EET) X-QQ-mid: bizesmtp3t1511168828taomigzpx Received: from [10.10.5.3] (unknown [124.202.244.90]) by esmtp4.qq.com (ESMTP) with id ; Mon, 20 Nov 2017 17:07:06 +0800 (CST) X-QQ-SSF: 00100000004000F0FJ80000A0000000 X-QQ-FEAT: gSW5HO8ru3wN9sDrbN4Nex9p+FBmkOTuAiQht1q67VWwn8wR5HJSeWODi4Wdg GLJZFB5AnAXSlQMomPFH8tg+MgbXq0Xt8NbvSerDBIxIl4VfeSsUcGN9gjf6mE4CQla2i5f Ev0Xh0YJMNYDdQkZYp2vaYDWnkeUaaFhteAcHALeg4Vg1WOV2aGu71VMEd2Xgu+7TE9Qpiw Oq7kOg7EQ95UhWJBz4xmvj7MEisxEqIjuyM7ZWRNYap8BA9M+v3QNPbr1WQdMnrVmrY5vx5 L7hHRQahMfyKNfqbjXDxk/u63s+XZWNZPI58WuaWbmT7ic X-QQ-GoodBg: 0 Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\)) From: =?gb2312?B?wfXG5w==?= In-Reply-To: <42fc3923-5575-8376-434b-40ffc831a972@gmail.com> Date: Mon, 20 Nov 2017 17:07:04 +0800 Message-Id: <1A828346-9423-48E1-9CFC-A57897FE7FA1@chinaffmpeg.org> References: <42fc3923-5575-8376-434b-40ffc831a972@gmail.com> To: and patches development discussions FFmpeg X-Mailer: Apple Mail (2.3445.4.7) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: Re: [FFmpeg-devel] [PATCH] ffmpeg: add return value check to suppress the build warning. 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: Michael Niedermayer , =?gb2312?B?wfXG5w==?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" > 在 2017年11月20日，08:40，Jun Zhao 写道： > > > <0001-ffmpeg-add-return-value-check-to-supress-the-build-w.patch>_______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel From 01a66eb4559fb3fec0765ee03417a65ef5e06fe1 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sat, 18 Nov 2017 13:24:24 +0800 Subject: [PATCH] ffmpeg: add return value check to supress the build warning. add return value check to supress the build warning message like "warning: ignoring return value" when use attribute -Wunused-result. Signed-off-by: Jun Zhao --- fftools/ffmpeg.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index babd85f7bc..0c16e75ab0 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -220,13 +220,18 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts) { AVFrame *frame = ist->sub2video.frame; int i; + int ret; av_assert1(frame->data[0]); ist->sub2video.last_pts = frame->pts = pts; - for (i = 0; i < ist->nb_filters; i++) - av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame, - AV_BUFFERSRC_FLAG_KEEP_REF | - AV_BUFFERSRC_FLAG_PUSH); + for (i = 0; i < ist->nb_filters; i++) { + ret = av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame, + AV_BUFFERSRC_FLAG_KEEP_REF | + AV_BUFFERSRC_FLAG_PUSH); + if (ret != AVERROR_EOF && ret < 0) + av_log(NULL, AV_LOG_WARNING, "Error while add the frame to buffer source(%s).\n", + av_err2str(ret)); + } } void sub2video_update(InputStream *ist, AVSubtitle *sub) @@ -295,11 +300,15 @@ static void sub2video_heartbeat(InputStream *ist, int64_t pts) static void sub2video_flush(InputStream *ist) { int i; + int ret; if (ist->sub2video.end_pts < INT64_MAX) sub2video_update(ist, NULL); - for (i = 0; i < ist->nb_filters; i++) - av_buffersrc_add_frame(ist->filters[i]->filter, NULL); + for (i = 0; i < ist->nb_filters; i++) { + ret = av_buffersrc_add_frame(ist->filters[i]->filter, NULL); + if (ret != AVERROR_EOF && ret < 0) + av_log(NULL, AV_LOG_WARNING, "Flush the frame error.\n"); + } } /* end of sub2video hack */ @@ -327,13 +336,14 @@ static int main_return_code = 0; static void sigterm_handler(int sig) { + int ret; received_sigterm = sig; received_nb_signals++; term_exit_sigsafe(); if(received_nb_signals > 3) { - write(2/*STDERR_FILENO*/, "Received > 3 system signals, hard exiting\n", - strlen("Received > 3 system signals, hard exiting\n")); - + ret = write(2/*STDERR_FILENO*/, "Received > 3 system signals, hard exiting\n", + strlen("Received > 3 system signals, hard exiting\n")); + if (ret < 0) { /* Do nothing */ }; exit(123); } }