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

avconv: move flushing the queued frames to configure_filtergraph()

Browse Source 
This is a more appropriate place for it, and will also be useful in the
following commit.
This commit is contained in:
Anton Khirnov 2016-06-27 18:59:23 +02:00
parent 7a745f014f
commit d2e56cf753
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
avconv.c
View File

@ -1231,17 +1231,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame)
av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n"); av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n");
return ret; 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); ret = av_buffersrc_add_frame(ifilter->filter, frame);

11
avconv_filter.c
View File

@ -769,6 +769,17 @@ int configure_filtergraph(FilterGraph *fg)
ofilter->channel_layout = link->channel_layout; ofilter->channel_layout = link->channel_layout;
} }
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;
}
}
return 0; return 0;
} }