diff options
Diffstat (limited to 'libmpcodecs/ad_faad.c')
| -rw-r--r-- | libmpcodecs/ad_faad.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 506dc51348..039cdc15e1 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -10,6 +10,7 @@ #include "config.h" #include "ad_internal.h" +#include "libaf/reorder_ch.h" static ad_info_t info = { @@ -277,6 +278,14 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) /* XXX: samples already multiplied by channels! */ mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n", sh->samplesize*faac_finfo.samples); + + if (sh->channels >= 5) + reorder_channel_copy_nch(faac_sample_buffer, + AF_CHANNEL_LAYOUT_AAC_DEFAULT, + buf+len, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + sh->channels, + faac_finfo.samples, sh->samplesize); + else memcpy(buf+len,faac_sample_buffer, sh->samplesize*faac_finfo.samples); last_dec_len = sh->samplesize*faac_finfo.samples; len += last_dec_len; |