diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-07 17:56:19 -0400 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-12 10:33:21 -0500 |
commit | b5e3e77711c6a4bef8b343d4d419e7ca67425fbc (patch) | |
tree | 6c506e9493021cf9c08d1761dcde855f68b5679a /libavformat/psxstr.c | |
parent | c9759eb426ea997822bf5e6cc43bb24b249e9e25 (diff) | |
download | ffmpeg-b5e3e77711c6a4bef8b343d4d419e7ca67425fbc.tar.gz |
psxstr: set channel layout
Diffstat (limited to 'libavformat/psxstr.c')
-rw-r--r-- | libavformat/psxstr.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 800d9cbcf3..633d61dd44 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -29,6 +29,7 @@ * RIFF headers, followed by CD sectors. */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" @@ -219,7 +220,13 @@ static int str_read_packet(AVFormatContext *s, st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = AV_CODEC_ID_ADPCM_XA; st->codec->codec_tag = 0; /* no fourcc */ - st->codec->channels = (fmt&1)?2:1; + if (fmt & 1) { + 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 = (fmt&4)?18900:37800; // st->codec->bit_rate = 0; //FIXME; st->codec->block_align = 128; |