fix crash in avformat consumer when audio encoding fails

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 424ad9f5b244b698ec6803fb86bd7c9dbfab2d97..1a99633bbb6e67674e1d9d2b2a2d10ef606d7a63 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -668,6 +668,7 @@ static int open_audio( mlt_properties properties, AVFormatContext *oc, AVStream
        else
        {
                mlt_log_warning( NULL, "%s: Unable to encode audio - disabling audio output.\n", __FILE__ );
+               audio_input_frame_size = 0;
        }
 
        return audio_input_frame_size;
@@ -1405,7 +1406,17 @@ static void *consumer_thread( void *arg )
                        audio_input_frame_size = open_audio( properties, oc, audio_st[i], audio_outbuf_size,
                                acodec? acodec : NULL );
                        if ( !audio_input_frame_size )
+                       {
+                               // Remove the audio stream from the output context
+                               int j;
+                               for ( j = 0; j < oc->nb_streams; j++ )
+                               {
+                                       if ( oc->streams[j] == audio_st[i] )
+                                               av_freep( &oc->streams[j] );
+                               }
+                               --oc->nb_streams;
                                audio_st[i] = NULL;
+                       }
                }
 
                // Setup custom I/O if redirecting