summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-04-12 21:28:45 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-04-12 21:28:45 +0000
commit77546eb75456e83a9140139e89fecbca051da36b (patch)
treea13740a219b56fa3d4003408a4f1a4daee349b13
parenta19db0165d357bfbfba259924407f4bb6138767f (diff)
downloadmpv-77546eb75456e83a9140139e89fecbca051da36b.tar.bz2
mpv-77546eb75456e83a9140139e89fecbca051da36b.tar.xz
Fix E-AC-3 channel ordering. E-AC-3 needs to use the same ordering as AC-3,
not the standard ordering. patch by Andrew de Quincey, adq_dvb lidskialf net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29173 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/ad_ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 32a9fc2789..d1de98e09f 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -175,7 +175,8 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
if (((AVCodecContext *)sh_audio->context)->channels >= 5) {
int src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT;
const char *codec=((AVCodecContext*)sh_audio->context)->codec->name;
- if (!strcasecmp(codec, "ac3"))
+ if (!strcasecmp(codec, "ac3")
+ || !strcasecmp(codec, "eac3"))
src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT;
else if (!strcasecmp(codec, "dca"))
src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT;