summaryrefslogtreecommitdiff
path: root/fftools
diff options
context:
space:
mode:
authorJun Zhao <jun.zhao@intel.com>2017-11-18 13:24:24 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2017-11-21 03:13:03 +0100
commita5870cb37f7a694a8dc3d6b8f2deaa8fd788e17e (patch)
treeb42389bc4d3b4f935d434f8ecc6573dee96dfe91 /fftools
parentd24e08e978792e09d212018677d1c0b8208ecef8 (diff)
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 <jun.zhao@intel.com> Reviewed-by: 刘歧 <lq@chinaffmpeg.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'fftools')
-rw-r--r--fftools/ffmpeg.c28
1 files 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);
}
}