diff options
| author | Peter Ross <pross@xvid.org> | 2011-04-25 11:52:15 +1000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2011-04-25 12:13:51 +1000 |
| commit | f27ac6d83c3d90cac49230480a8569a1651763bd (patch) | |
| tree | ec6b8cf788dea917624018f5c8a6687ef3a03b4f /libavformat/eacdata.c | |
| parent | 989fb05fe344d9666db858e0577c44969625184e (diff) | |
| download | ffmpeg-f27ac6d83c3d90cac49230480a8569a1651763bd.tar.gz | |
Set channel layout for 4 and 5.1 channel cdata audio files
Patch from Carl Eugen Hoyos (cehoyos at ag dot or dot at)
Signed-off-by: Peter Ross <pross@xvid.org>
Diffstat (limited to 'libavformat/eacdata.c')
| -rw-r--r-- | libavformat/eacdata.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c index c8999c6b23..ef474b3604 100644 --- a/libavformat/eacdata.c +++ b/libavformat/eacdata.c @@ -50,13 +50,14 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap) AVIOContext *pb = s->pb; unsigned int sample_rate, header; AVStream *st; + int64_t channel_layout = 0; header = avio_rb16(pb); switch (header) { case 0x0400: cdata->channels = 1; break; case 0x0404: cdata->channels = 2; break; - case 0x040C: cdata->channels = 4; break; - case 0x0414: cdata->channels = 6; break; + case 0x040C: cdata->channels = 4; channel_layout = AV_CH_LAYOUT_QUAD; break; + case 0x0414: cdata->channels = 6; channel_layout = AV_CH_LAYOUT_5POINT1_BACK; break; default: av_log(s, AV_LOG_INFO, "unknown header 0x%04x\n", header); return -1; @@ -72,6 +73,7 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_tag = 0; /* no fourcc */ st->codec->codec_id = CODEC_ID_ADPCM_EA_XAS; st->codec->channels = cdata->channels; + st->codec->channel_layout = channel_layout; st->codec->sample_rate = sample_rate; st->codec->sample_fmt = AV_SAMPLE_FMT_S16; av_set_pts_info(st, 64, 1, sample_rate); |