diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-07 12:49:11 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-12 10:33:18 -0500 |
| commit | 0d09a5848f49d37d77980f28cde9ad1987ce1eb4 (patch) | |
| tree | 8be6282f0f4c0cc86f90ba76e703ae5b59a9ae2c /libavformat/cdxl.c | |
| parent | e8088d6e4b1255a8a5969ef925e4eb3a01f0988b (diff) | |
| download | ffmpeg-0d09a5848f49d37d77980f28cde9ad1987ce1eb4.tar.gz | |
cdxl: set channel layout
Diffstat (limited to 'libavformat/cdxl.c')
| -rw-r--r-- | libavformat/cdxl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c index d61cbd9a3d..a2cba526ca 100644 --- a/libavformat/cdxl.c +++ b/libavformat/cdxl.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/parseutils.h" #include "libavutil/opt.h" @@ -101,7 +102,13 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_tag = 0; st->codec->codec_id = AV_CODEC_ID_PCM_S8; - st->codec->channels = cdxl->header[1] & 0x10 ? 2 : 1; + if (cdxl->header[1] & 0x10) { + 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 = cdxl->sample_rate; st->start_time = 0; cdxl->audio_stream_index = st->index; |