summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-11 04:55:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-11 04:55:58 +0200
commit16de4d927e8bd1308694217af6027265700b3694 (patch)
tree44c3156a42cda88b1bba3d190f14ceeefef89a5e /ffmpeg.c
parent5e3da256184e13502b3428f94e180888436d157b (diff)
downloadffmpeg-16de4d927e8bd1308694217af6027265700b3694.tar.gz
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters
Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 0807eec0b6..ee8039cce8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1821,18 +1821,10 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
for (i = 0; i < nb_filtergraphs; i++)
if (ist_in_filtergraph(filtergraphs[i], ist)) {
FilterGraph *fg = filtergraphs[i];
- int j;
if (configure_filtergraph(fg) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
exit_program(1);
}
- for (j = 0; j < fg->nb_outputs; j++) {
- OutputStream *ost = fg->outputs[j]->ost;
- if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
- !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
- av_buffersink_set_frame_size(ost->filter->filter,
- ost->enc_ctx->frame_size);
- }
}
}