aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-04-07 16:45:48 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-11-12 10:33:20 -0500
commit43711312831504c42d2db3bbeafc893883bee911 (patch)
tree42df5cfa3b65482f11824aee984d44a5c171bd5e
parent41a2d9590d89c3f240b1ef875649852197d945eb (diff)
downloadffmpeg-43711312831504c42d2db3bbeafc893883bee911.tar.gz
iss: set channel layout
-rw-r--r--libavformat/iss.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/iss.c b/libavformat/iss.c
index 14f64d2392..3f7f4feff2 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"
@@ -94,7 +95,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;