har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "lavfi/buffersrc: push the frame deeper if requested."

Browse Source 
Fixes framesync filters with shortest option enabled.

This reverts commit 0ff5567a30be6d7c804e95997ae282d6bacd76c3.
This commit is contained in:
Paul B Mahol 2017-06-23 16:18:42 +02:00
parent 9f26d670e4
commit 04aa09c4bc
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/buffersrc.c
View File

@ -173,20 +173,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra
return ret; return ret;
} }
static int push_frame(AVFilterGraph *graph)
{
int ret;
while (1) {
ret = ff_filter_graph_run_once(graph);
if (ret == AVERROR(EAGAIN))
break;
if (ret < 0)
return ret;
}
return 0;
}
static int av_buffersrc_add_frame_internal(AVFilterContext *ctx, static int av_buffersrc_add_frame_internal(AVFilterContext *ctx,
AVFrame *frame, int flags) AVFrame *frame, int flags)
{ {
@ -199,11 +185,6 @@ static int av_buffersrc_add_frame_internal(AVFilterContext *ctx,
if (!frame) { if (!frame) {
s->eof = 1; s->eof = 1;
ff_avfilter_link_set_in_status(ctx->outputs[0], AVERROR_EOF, AV_NOPTS_VALUE); ff_avfilter_link_set_in_status(ctx->outputs[0], AVERROR_EOF, AV_NOPTS_VALUE);
if ((flags & AV_BUFFERSRC_FLAG_PUSH)) {
ret = push_frame(ctx->graph);
if (ret < 0)
return ret;
}
return 0; return 0;
} else if (s->eof) } else if (s->eof)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -258,12 +239,6 @@ static int av_buffersrc_add_frame_internal(AVFilterContext *ctx,
if ((ret = ctx->output_pads[0].request_frame(ctx->outputs[0])) < 0) if ((ret = ctx->output_pads[0].request_frame(ctx->outputs[0])) < 0)
return ret; return ret;
if ((flags & AV_BUFFERSRC_FLAG_PUSH)) {
ret = push_frame(ctx->graph);
if (ret < 0)
return ret;
}
return 0; return 0;
} }