# HG changeset patch
# User uau
# Date 1186091654 0
# Node ID ef6e50c3c17282b1bab99e9bfce7b21f8374d6df
# Parent  534bd164baaabcbb97fa54d833a2368362db2acc
Revert setting audio output channel count for FFmpeg

The FFmpeg API needs to be fixed before this can be done sanely.
ffdca wants the desired output channel count to be set in
avctx->channels. Unfortunately it also completely fails if the requested
number of channels is not available rather than returning a different
amount (if 6 channels are requested we'd probably rather use stereo than
fail completely).
ffvorbis ignores caller-set values in avctx->channels. It writes the
channel count there once during init. This means the caller can only
set the count before init because later there would be no indication
whether the channel count in avctx reflects real output.
ffwma requires the caller to supply the encoded channel count
in avctx->channels during init or it fails. So it is not possible to
set a different number of desired output channels there before init
either.

diff -r 534bd164baaa -r ef6e50c3c172 libmpcodecs/ad_ffmpeg.c
--- a/libmpcodecs/ad_ffmpeg.c	Thu Aug 02 16:26:14 2007 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Thu Aug 02 21:54:14 2007 +0000
@@ -86,8 +86,6 @@
                lavc_context->extradata_size);	
     }
 
-    // Set desired number of channels
-    lavc_context->channels = audio_output_channels;
     /* open it */
     if (avcodec_open(lavc_context, lavc_codec) < 0) {
         mp_msg(MSGT_DECAUDIO,MSGL_ERR, MSGTR_CantOpenCodec);