[MPlayer-cvslog] r29173 - trunk/libmpcodecs/ad_ffmpeg.c

[diego]

Author: diego
Date: Sun Apr 12 23:28:45 2009
New Revision: 29173

Log:
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

Modified:
   trunk/libmpcodecs/ad_ffmpeg.c

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	Sun Apr 12 22:44:20 2009	(r29172)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Sun Apr 12 23:28:45 2009	(r29173)
@@ -175,7 +175,8 @@ static int decode_audio(sh_audio_t *sh_a
 	  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;