ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not...
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Sep 2014 02:55:58 +0000 (04:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Sep 2014 02:55:58 +0000 (04:55 +0200)
Fixes Ticket3562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg_filter.c

index 0807eec0b63a1baa58ed2232daf60f6e3178bde8..ee8039cce8115db98e7df9d0bcca2ee92b670ef1 100644 (file)
--- 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);
-                }
             }
     }
 
index 93af8cef1865490fd624ad08b80f4e24b22bbcf1..d52b1f7d76ed12e55469dd0c9c6dfb747854ccc9 100644 (file)
@@ -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;
 }