[FFmpeg-cvslog] wtv: set channel layout for mpeg audio

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sat Apr  7 18:55:43 2012 -0400| [935fbb66ef325019ee5a64d1efae69282c68d050] | committer: Justin Ruggles

wtv: set channel layout for mpeg audio

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=935fbb66ef325019ee5a64d1efae69282c68d050
---

 libavformat/wtv.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index 57d239e..7bb421b 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -25,6 +25,7 @@
  * @author Peter Ross <pross at 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;
     }
 }