summaryrefslogtreecommitdiff
path: root/libavformat/cafdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-23 10:30:18 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-23 10:30:18 +0200
commit8bb5d1c39c9646022720ec93ef8a1b49bf558790 (patch)
treefc2d01a8469914eb376394dbeb495525b4d1c34b /libavformat/cafdec.c
parent2a2146aac0e1c7649d674905b6a6645b722aef2e (diff)
Support channel layout when demuxing caf files.
Diffstat (limited to 'libavformat/cafdec.c')
-rw-r--r--libavformat/cafdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 43d466f8c4..3cf4b6ca0c 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -257,6 +257,12 @@ static int read_header(AVFormatContext *s,
read_info_chunk(s, size);
break;
+ case MKBETAG('c','h','a','n'):
+ if (size < 12)
+ return AVERROR_INVALIDDATA;
+ ff_read_chan_chunk(s, size, st->codec);
+ break;
+
default:
#define _(x) ((x) >= ' ' ? (x) : ' ')
av_log(s, AV_LOG_WARNING, "skipping CAF chunk: %08X (%c%c%c%c), size %"PRId64"\n",