mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg_filter: merge block with the enclosing one
It has no reason to exist.
This commit is contained in:
parent
639208cc6a
commit
f344277a88
|
@ -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);
|
||||
// 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++;
|
||||
}
|
||||
|
||||
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) {
|
||||
|
|
Loading…
Reference in New Issue