summaryrefslogtreecommitdiff
path: root/libavformat/cafdec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-04-07 12:40:50 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-07-19 13:26:45 -0400
commit3bab7cd12802dc5abf2c5cc6dec49e9e249ce204 (patch)
tree5d14d61f0cbe7473b293cd4cea4a35fd1bdd17c9 /libavformat/cafdec.c
parentc0196a14b9f0f920da30bc30a8887fae9050a4b3 (diff)
downloadffmpeg-3bab7cd12802dc5abf2c5cc6dec49e9e249ce204.tar.gz
avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer
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 15a1e2207c..6c40b1b229 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -29,6 +29,7 @@
#include "internal.h"
#include "riff.h"
#include "isom.h"
+#include "mov_chan.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intfloat.h"
#include "libavutil/dict.h"
@@ -266,6 +267,11 @@ static int read_header(AVFormatContext *s)
found_data = 1;
break;
+ case MKBETAG('c','h','a','n'):
+ if ((ret = ff_mov_read_chan(s, st, size)) < 0)
+ return ret;
+ break;
+
/* magic cookie chunk */
case MKBETAG('k','u','k','i'):
if (read_kuki_chunk(s, size))