[FFmpeg-cvslog] examples/filtering_video: drop an always true condition
Zhao Zhili
git at videolan.org
Wed May 16 01:45:23 EEST 2018
ffmpeg | branch: master | Zhao Zhili <wantlamy at gmail.com> | Mon May 14 20:17:59 2018 +0800| [84d4af4ea8aacb43abef57f0542cec209705fead] | committer: Michael Niedermayer
examples/filtering_video: drop an always true condition
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84d4af4ea8aacb43abef57f0542cec209705fead
---
doc/examples/filtering_video.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c
index 38ff9bb7db..b2191251b5 100644
--- a/doc/examples/filtering_video.c
+++ b/doc/examples/filtering_video.c
@@ -247,27 +247,25 @@ int main(int argc, char **argv)
goto end;
}
- if (ret >= 0) {
- frame->pts = frame->best_effort_timestamp;
+ frame->pts = frame->best_effort_timestamp;
- /* push the decoded frame into the filtergraph */
- if (av_buffersrc_add_frame_flags(buffersrc_ctx, frame, AV_BUFFERSRC_FLAG_KEEP_REF) < 0) {
- av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n");
+ /* push the decoded frame into the filtergraph */
+ if (av_buffersrc_add_frame_flags(buffersrc_ctx, frame, AV_BUFFERSRC_FLAG_KEEP_REF) < 0) {
+ av_log(NULL, AV_LOG_ERROR, "Error while feeding the filtergraph\n");
+ break;
+ }
+
+ /* pull filtered frames from the filtergraph */
+ while (1) {
+ ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
+ if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
break;
- }
-
- /* pull filtered frames from the filtergraph */
- while (1) {
- ret = av_buffersink_get_frame(buffersink_ctx, filt_frame);
- if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
- break;
- if (ret < 0)
- goto end;
- display_frame(filt_frame, buffersink_ctx->inputs[0]->time_base);
- av_frame_unref(filt_frame);
- }
- av_frame_unref(frame);
+ if (ret < 0)
+ goto end;
+ display_frame(filt_frame, buffersink_ctx->inputs[0]->time_base);
+ av_frame_unref(filt_frame);
}
+ av_frame_unref(frame);
}
}
av_packet_unref(&packet);
More information about the ffmpeg-cvslog
mailing list