diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 11:09:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 11:09:38 +0100 |
| commit | 799d749c77de28a6790db48b3465ecdc56822d96 (patch) | |
| tree | 79e62292d12bb4615ba643f2d351d9e6657099e0 /libavformat/wtvdec.c | |
| parent | 7eb40d85f2258df31287dc7a0704cb35e356c077 (diff) | |
| parent | b9629acb6b647b31b8b4e3932e836189bd03e5b9 (diff) | |
| download | ffmpeg-799d749c77de28a6790db48b3465ecdc56822d96.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
yop: set channel layout
wtv: set channel layout for mpeg audio
westwood_aud: set channel layout
wc3movie: set channel layout
tmv: set channel layout
tiertexseq: set channel layout
swfdec: set channel layout
sol: set channel layout
smacker: set channel layout
siff: set channel layout
sierravmd: set channel layout
rtpdec_amr: set channel layout
rsodec: set channel layout
rmdec: set channel layout for RA version 3
qcp: set channel layout
psxstr: set channel layout
omadec: set channel layout
oggparsespeex: validate channel count and set channel layout
nuv: set channel layout
mxg: set channel layout
...
Conflicts:
libavformat/swfdec.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtvdec.c')
| -rw-r--r-- | libavformat/wtvdec.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index c030ab6d69..c3f57504e9 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.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 "avformat.h" @@ -558,8 +559,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; } } |