aboutsummaryrefslogtreecommitdiffstats
path: root/fftools/ffmpeg_filter.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2024-03-09 19:58:46 +0100
committerAnton Khirnov <anton@khirnov.net>2024-03-12 09:47:56 +0100
commitf344277a880b712d008b4200a9c09bee386c8bd5 (patch)
treed468dafb040ba2faa16dccc6686e5d30ac4db941 /fftools/ffmpeg_filter.c
parent639208cc6adae159008e089f7d82f132720f7fc9 (diff)
downloadffmpeg-f344277a880b712d008b4200a9c09bee386c8bd5.tar.gz
fftools/ffmpeg_filter: merge block with the enclosing one
It has no reason to exist.
Diffstat (limited to 'fftools/ffmpeg_filter.c')
-rw-r--r--fftools/ffmpeg_filter.c20
1 files 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) {