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/omadec.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/omadec.c')
| -rw-r--r-- | libavformat/omadec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 5f7669a0a7..59fff73b2f 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -40,6 +40,7 @@ * CODEC SUPPORT: Only ATRAC3 codec is currently supported! */ +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "libavutil/intreadwrite.h" @@ -318,6 +319,7 @@ static int oma_read_header(AVFormatContext *s) framesize = (codec_params & 0x3FF) * 8; jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */ st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; st->codec->sample_rate = samplerate; st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024; @@ -352,6 +354,7 @@ static int oma_read_header(AVFormatContext *s) case OMA_CODECID_LPCM: /* PCM 44.1 kHz 16 bit stereo big-endian */ st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; st->codec->sample_rate = 44100; framesize = 1024; /* bit rate = sample rate x PCM block align (= 4) x 8 */ |