summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-06-27 18:59:23 +0200
committerAnton Khirnov <anton@khirnov.net>2016-06-28 08:30:20 +0200
commitd2e56cf753a6c462041dee897d9d0c90f349988c (patch)
treed8c67aa3d8c1e361ebb2709e1e2da6d706210025 /avconv.c
parent7a745f014f528d1001394ae4d2f4ed1a20bf7fa2 (diff)
avconv: 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.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/avconv.c b/avconv.c
index 4eae0151c6..778de654cb 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1231,17 +1231,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(ifilter->filter, frame);