diff options
author | Anton Khirnov <anton@khirnov.net> | 2024-03-09 19:58:46 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2024-03-09 20:01:11 +0100 |
commit | 4273b28bdc5ee36986b5d05650576f3d26c10f34 (patch) | |
tree | 4411b13eec879b9b45ed79d6e06ef5d62883cddc | |
parent | e570b65cbd5acdeea5e94f918189bfae1f5186be (diff) |
fftools/ffmpeg_filter: merge block with the enclosing one
It has no reason to exist.
-rw-r--r-- | fftools/ffmpeg_filter.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 7cd5415341..a87bed6ec7 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) { |