RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jun Zhao 2017-11-18 13:24:24 +08:00 committed by Michael Niedermayer
parent d24e08e978
commit a5870cb37f
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffmpeg.c
View File

@ -220,13 +220,18 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts)
{ {
AVFrame *frame = ist->sub2video.frame; AVFrame *frame = ist->sub2video.frame;
int i; int i;
int ret;
av_assert1(frame->data[0]); av_assert1(frame->data[0]);
ist->sub2video.last_pts = frame->pts = pts; ist->sub2video.last_pts = frame->pts = pts;
for (i = 0; i < ist->nb_filters; i++) for (i = 0; i < ist->nb_filters; i++) {
av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame, ret = av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame,
AV_BUFFERSRC_FLAG_KEEP_REF | AV_BUFFERSRC_FLAG_KEEP_REF |
AV_BUFFERSRC_FLAG_PUSH); 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) 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) static void sub2video_flush(InputStream *ist)
{ {
int i; int i;
int ret;
if (ist->sub2video.end_pts < INT64_MAX) if (ist->sub2video.end_pts < INT64_MAX)
sub2video_update(ist, NULL); sub2video_update(ist, NULL);
for (i = 0; i < ist->nb_filters; i++) for (i = 0; i < ist->nb_filters; i++) {
av_buffersrc_add_frame(ist->filters[i]->filter, NULL); 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 */ /* end of sub2video hack */
@ -327,13 +336,14 @@ static int main_return_code = 0;
static void static void
sigterm_handler(int sig) sigterm_handler(int sig)
{ {
int ret;
received_sigterm = sig; received_sigterm = sig;
received_nb_signals++; received_nb_signals++;
term_exit_sigsafe(); term_exit_sigsafe();
if(received_nb_signals > 3) { if(received_nb_signals > 3) {
write(2/*STDERR_FILENO*/, "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")); strlen("Received > 3 system signals, hard exiting\n"));
if (ret < 0) { /* Do nothing */ };
exit(123); exit(123);
} }
} }