AviSynth audio: always set input channel order

HomeOfAviSynthPlusEvolution · May 23, 2024 · d652386 · d652386
1 parent 2689e4a
commit d652386
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/AviSynth/audio_output.cpp b/AviSynth/audio_output.cpp
@@ -63,14 +63,12 @@ void as_setup_audio_rendering
 )
 {
     /* Channel layout. */
+    if (ctx->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
+        av_channel_layout_default(&ctx->ch_layout, ctx->ch_layout.nb_channels);
     if ( channel_layout != 0 )
         av_channel_layout_from_string(&aohp->output_channel_layout, channel_layout );
     else
-    {
         av_channel_layout_copy(&aohp->output_channel_layout, &ctx->ch_layout);
-        if (aohp->output_channel_layout.order == AV_CHANNEL_ORDER_UNSPEC)
-            av_channel_layout_default(&aohp->output_channel_layout, aohp->output_channel_layout.nb_channels);
-    }
     /* Sample rate. */
     if( sample_rate > 0 )
         aohp->output_sample_rate = sample_rate;