From 3d0271ef4094f59a48f9c0411dc76af4ac88c177 Mon Sep 17 00:00:00 2001 From: uau Date: Thu, 2 Aug 2007 21:54:14 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23998 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_ffmpeg.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index fa88061f5d..8731373511 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -86,8 +86,6 @@ static int init(sh_audio_t *sh_audio) 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); -- cgit v1.2.3