[MPlayer-cvslog] r37487 - branches/1.2/libmpcodecs/ad_ffmpeg.c

[rtogni]

Author: rtogni
Date: Sat Sep  5 22:11:26 2015
New Revision: 37487

Log:
Revert r37447 for the release

This restores the old way of requesting channels to ffmpeg audio decoders

Modified:
   branches/1.2/libmpcodecs/ad_ffmpeg.c

Modified: branches/1.2/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- branches/1.2/libmpcodecs/ad_ffmpeg.c	Sat Sep  5 22:09:42 2015	(r37486)
+++ branches/1.2/libmpcodecs/ad_ffmpeg.c	Sat Sep  5 22:11:26 2015	(r37487)
@@ -46,7 +46,6 @@ LIBAD_EXTERN(ffmpeg)
 
 #include "libavcodec/avcodec.h"
 #include "libavutil/dict.h"
-#include "libavutil/channel_layout.h"
 
 struct adctx {
     int last_samplerate;
@@ -128,7 +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;
-    lavc_context->request_channel_layout = av_get_default_channel_layout(audio_output_channels);
+    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