Fix regression in multiple audio tracks.

Regresssion introduced with audiochannels normalization filter.

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index d868e46c18df662d0c22da94d8f650a2d438df4d..179815cd3def5aee5dc0fad8aa010811de7c5437 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -1244,6 +1244,7 @@ static void *consumer_thread( void *arg )
                        total_channels = channels;
                }
        }
+       mlt_properties_set_int( properties, "channels", total_channels );
 
        // Set the parameters (even though we have none...)
        if ( av_set_parameters(oc, NULL) >= 0 ) 
@@ -1362,6 +1363,7 @@ static void *consumer_thread( void *arg )
                        if ( !terminated && audio_st[0] )
                        {
                                samples = mlt_sample_calculator( fps, frequency, count ++ );
+                               channels = total_channels;
                                mlt_frame_get_audio( frame, (void**) &pcm, &aud_fmt, &frequency, &channels, &samples );
 
                                // Save the audio channel remap properties for later