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/iss.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/iss.c')
| -rw-r--r-- | libavformat/iss.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/iss.c b/libavformat/iss.c index 4268900840..e4335b4cbf 100644 --- a/libavformat/iss.c +++ b/libavformat/iss.c @@ -26,6 +26,7 @@ * @see http://wiki.multimedia.cx/index.php?title=FunCom_ISS */ +#include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" #include "libavutil/avstring.h" @@ -99,7 +100,13 @@ static av_cold int iss_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_ISS; - st->codec->channels = stereo ? 2 : 1; + if (stereo) { + 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->sample_rate = 44100; if(rate_divisor > 0) st->codec->sample_rate /= rate_divisor; |