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

[SubJunk]

Author: SubJunk
Date: Thu Jan 22 04:37:31 2015
New Revision: 37363

Log:
Fixed support for transcoding DTS-ES (7 channel audio) to AC-3

Like the previous commit, which reverted r37335, this one reverts an older revision that broke the DTS-ES transcoding support.

Modified:
   trunk/libmpcodecs/ad_ffmpeg.c

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	Thu Jan 22 03:29:44 2015	(r37362)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Thu Jan 22 04:37:31 2015	(r37363)
@@ -127,10 +127,7 @@ static int init(sh_audio_t *sh_audio)
 	lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample;
     }
     lavc_context->channel_layout = sh_audio->channel_layout;
-    if (audio_output_channels == 1)
-        lavc_context->request_channel_layout = AV_CH_LAYOUT_MONO;
-    else if (audio_output_channels == 2)
-        lavc_context->request_channel_layout = AV_CH_LAYOUT_STEREO;
+    lavc_context->request_channels = audio_output_channels;
     lavc_context->codec_tag = sh_audio->format; //FOURCC
     lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi