From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sat, 7 Apr 2012 22:55:43 +0000 (-0400)
Subject: wtv: set channel layout for mpeg audio
X-Git-Tag: android-x86-4.4-r1~364^2~2700
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=935fbb66ef325019ee5a64d1efae69282c68d050;p=android-x86%2Fexternal-ffmpeg.git

wtv: set channel layout for mpeg audio
---

diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index 57d239eb88..7bb421b0ce 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -25,6 +25,7 @@
  * @author Peter Ross <pross@xvid.org>
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat.h"
 #include "libavutil/dict.h"
@@ -618,8 +619,14 @@ static void parse_mpeg1waveformatex(AVStream *st)
 
     /* dwHeadMode */
     switch (AV_RL16(st->codec->extradata + 6)) {
-    case 1 : case 2 : case 4 : st->codec->channels = 2; break;
-    case 8 :                   st->codec->channels = 1; break;
+    case 1 :
+    case 2 :
+    case 4 : st->codec->channels       = 2;
+             st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+             break;
+    case 8 : st->codec->channels       = 1;
+             st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+             break;
     }
 }