diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 10:55:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 10:55:07 +0100 |
| commit | 7eb40d85f2258df31287dc7a0704cb35e356c077 (patch) | |
| tree | fc2054037b541d507aa2af4009dd85ad41eeaaf3 /libavformat/apc.c | |
| parent | a8f2420e06d515d71724d83b3f73f31328e8ebd5 (diff) | |
| parent | ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b (diff) | |
| download | ffmpeg-7eb40d85f2258df31287dc7a0704cb35e356c077.tar.gz | |
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
jvdec: set channel layout
iss: set channel layout
ipmovie: set channel layout
iff: set channel layout
idroqdec: set channel layout
gxfdec: set channel layout when applicable
gsmdec: set channel layout
flvdec: set channel layout
dv: set channel layout
dsicin: set channel layout
daud: set channel layout
cdxl: set channel layout
bmv: set channel layout
bink: set channel layout
bfi: set channel layout
bethsoftvid: set channel layout
apc: set channel layout
amr: set channel_layout
ppc: replace pointer casting with AV_COPY32
ppc: fix some unused variable warnings
...
Conflicts:
libavformat/amr.c
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apc.c')
| -rw-r--r-- | libavformat/apc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavformat/apc.c b/libavformat/apc.c index 2ccf7946aa..bb28a628f7 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -20,6 +20,8 @@ */ #include <string.h> + +#include "libavutil/channel_layout.h" #include "avformat.h" static int apc_probe(AVProbeData *p) @@ -58,9 +60,13 @@ static int apc_read_header(AVFormatContext *s) /* initial predictor values for adpcm decoder */ avio_read(pb, st->codec->extradata, 2 * 4); - st->codec->channels = 1; - if (avio_rl32(pb)) - st->codec->channels = 2; + if (avio_rl32(pb)) { + st->codec->channels = 2; + st->codec->channel_layout = AV_CH_LAYOUT_STEREO; + } else { + st->codec->channels = 1; + st->codec->channel_layout = AV_CH_LAYOUT_MONO; + } st->codec->bits_per_coded_sample = 4; st->codec->bit_rate = st->codec->bits_per_coded_sample * st->codec->channels |