From 16de4d927e8bd1308694217af6027265700b3694 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 11 Sep 2014 04:55:58 +0200
Subject: [PATCH] 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>
---
ffmpeg.c | 8 --------
ffmpeg_filter.c | 10 ++++++++++
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 0807eec0b63..ee8039cce81 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);
- }
}
}
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 93af8cef186..d52b1f7d76e 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -928,6 +928,16 @@ int configure_filtergraph(FilterGraph *fg)
}
fg->reconfiguration = 1;
+
+ for (i = 0; i < fg->nb_outputs; i++) {
+ OutputStream *ost = fg->outputs[i]->ost;
+ if (ost &&
+ 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);
+ }
+
return 0;
}
--
GitLab