fftools/ffmpeg_filter: merge block with the enclosing one
It has no reason to exist.
This commit is contained in:
@@ -2251,7 +2251,6 @@ static int fg_output_frame(OutputFilterPriv *ofp, FilterGraphThread *fgt,
|
|||||||
frame_out = frame;
|
frame_out = frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
// send the frame to consumers
|
// send the frame to consumers
|
||||||
ret = sch_filter_send(fgp->sch, fgp->sch_idx, ofp->index, frame_out);
|
ret = sch_filter_send(fgp->sch, fgp->sch_idx, ofp->index, frame_out);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
@@ -2264,7 +2263,6 @@ static int fg_output_frame(OutputFilterPriv *ofp, FilterGraphThread *fgt,
|
|||||||
|
|
||||||
return ret == AVERROR_EOF ? 0 : ret;
|
return ret == AVERROR_EOF ? 0 : ret;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (type == AVMEDIA_TYPE_VIDEO) {
|
if (type == AVMEDIA_TYPE_VIDEO) {
|
||||||
ofp->fps.frame_number++;
|
ofp->fps.frame_number++;
|
||||||
|
Reference in New Issue
Block a user