Re: [libav-devel] [PATCH 41/42] wtv: set channel layout for mpeg audio

2012-11-12 Thread Martin Storsjö 

On Mon, 12 Nov 2012, Justin Ruggles wrote:


---
libavformat/wtv.c |   11 +--
1 files 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 
 */

+#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;
}
}

--
1.7.1


Ok

// Martin
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 41/42] wtv: set channel layout for mpeg audio

2012-11-11 Thread Justin Ruggles 
---
 libavformat/wtv.c |   11 +--
 1 files 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 
  */
 
+#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;
 }
 }
 
-- 
1.7.1

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel