git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b48d93
)
wtv: set channel layout for mpeg audio
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 7 Apr 2012 22:55:43 +0000
(18:55 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 12 Nov 2012 15:33:23 +0000
(10:33 -0500)
libavformat/wtv.c
patch
|
blob
|
history
diff --git
a/libavformat/wtv.c
b/libavformat/wtv.c
index
57d239e
..
7bb421b
100644
(file)
--- a/
libavformat/wtv.c
+++ b/
libavformat/wtv.c
@@
-25,6
+25,7
@@
* @author Peter Ross <pross@xvid.org>
*/
* @author Peter Ross <pross@xvid.org>
*/
+#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intfloat.h"
#include "libavutil/dict.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)) {
/* 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;
}
}
}
}