summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-30 15:19:35 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-30 15:19:35 +0000
commit80e0ec3e105274729216ee97789d9debd0d7cc92 (patch)
tree61dc33273680b29ff38c5fce3ef62bd4afa6295b /libmpcodecs
parent1233361b465319491bdda3c00a887364259a2ce6 (diff)
downloadmpv-80e0ec3e105274729216ee97789d9debd0d7cc92.tar.bz2
mpv-80e0ec3e105274729216ee97789d9debd0d7cc92.tar.xz
Indicate desired number of output channels to ffmpeg audio decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23937 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 8731373511..d4a729a192 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -7,6 +7,7 @@
#include "help_mp.h"
#include "ad_internal.h"
+extern int audio_output_channels;
#include "mpbswap.h"
@@ -105,6 +106,8 @@ static int init(sh_audio_t *sh_audio)
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;