summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-06-27 18:59:23 +0200
committerwm4 <nfxjfg@googlemail.com>2017-03-03 08:45:43 +0100
commitcb884f8d7e3b55cddf8a4568bddb1e5f5f86b811 (patch)
tree1394acc28b5ed84e4fcead1d904ba06e16522f50 /ffmpeg.c
parent97614a68e474062b46f6fae92bf34976f3436c6a (diff)
downloadffmpeg-cb884f8d7e3b55cddf8a4568bddb1e5f5f86b811.tar.gz
ffmpeg: move flushing the queued frames to configure_filtergraph()
This is a more appropriate place for it, and will also be useful in the following commit. This merges Libav commit d2e56cf. It was previously skipped. Signed-off-by: wm4 <nfxjfg@googlemail.com>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 88f68342ed..f52d3e2f0f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2186,17 +2186,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n");
return ret;
}
-
- for (i = 0; i < fg->nb_inputs; i++) {
- while (av_fifo_size(fg->inputs[i]->frame_queue)) {
- AVFrame *tmp;
- av_fifo_generic_read(fg->inputs[i]->frame_queue, &tmp, sizeof(tmp), NULL);
- ret = av_buffersrc_add_frame(fg->inputs[i]->filter, tmp);
- av_frame_free(&tmp);
- if (ret < 0)
- return ret;
- }
- }
}
ret = av_buffersrc_add_frame_flags(ifilter->filter, frame, AV_BUFFERSRC_FLAG_PUSH);