[FFmpeg-cvslog] fftools/ffmpeg_filter: merge block with the enclosing one
Anton Khirnov
git at videolan.org
Tue Mar 12 10:49:33 EET 2024
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Mar 9 19:58:46 2024 +0100| [f344277a880b712d008b4200a9c09bee386c8bd5] | committer: Anton Khirnov
fftools/ffmpeg_filter: merge block with the enclosing one
It has no reason to exist.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f344277a880b712d008b4200a9c09bee386c8bd5
---
fftools/ffmpeg_filter.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 8134afebd7..7d5b3a0e9d 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2251,19 +2251,17 @@ static int fg_output_frame(OutputFilterPriv *ofp, FilterGraphThread *fgt,
frame_out = frame;
}
- {
- // send the frame to consumers
- ret = sch_filter_send(fgp->sch, fgp->sch_idx, ofp->index, frame_out);
- if (ret < 0) {
- av_frame_unref(frame_out);
-
- if (!fgt->eof_out[ofp->index]) {
- fgt->eof_out[ofp->index] = 1;
- fgp->nb_outputs_done++;
- }
+ // send the frame to consumers
+ ret = sch_filter_send(fgp->sch, fgp->sch_idx, ofp->index, frame_out);
+ if (ret < 0) {
+ av_frame_unref(frame_out);
- return ret == AVERROR_EOF ? 0 : ret;
+ if (!fgt->eof_out[ofp->index]) {
+ fgt->eof_out[ofp->index] = 1;
+ fgp->nb_outputs_done++;
}
+
+ return ret == AVERROR_EOF ? 0 : ret;
}
if (type == AVMEDIA_TYPE_VIDEO) {
More information about the ffmpeg-cvslog
mailing list