[MPlayer-dev-eng] [PATCH] enable ffdca downmixing

[Reimar Döffinger]

Hello,
attached patch makes MPlayer use ffdca's downmixing.
Ok to apply? And how about moving the
"extern int audio_output_channels;" into ad_internal.h right thereafter?

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libmpcodecs/ad_ffmpeg.c
===================================================================
--- libmpcodecs/ad_ffmpeg.c	(revision 23851)
+++ libmpcodecs/ad_ffmpeg.c	(working copy)
@@ -7,6 +7,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+extern int audio_output_channels;
 
 #include "mpbswap.h"
 
@@ -105,6 +106,8 @@
        sh_audio->ds->ss_mul = 2*sh_audio->wf->nChannels; // 1 byte*ch/packet
    }
 
+   // Set desired number of channels
+   lavc_context->channels = audio_output_channels;
    // Decode at least 1 byte:  (to get header filled)
    x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size);
    if(x>0) sh_audio->a_buffer_len=x;