summaryrefslogtreecommitdiff
path: root/libavformat/aiffdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-28 10:45:32 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-28 10:45:32 +0200
commit91b782720fd0df5571775b6591bc41797d6ecf78 (patch)
treee53a8bc0dd01508966e57082f1f9cc003ccbd069 /libavformat/aiffdec.c
parent0665199e438fcdd2000717352fc665a8cf017f7c (diff)
Move channel chunk reading function to isom.c.
Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().
Diffstat (limited to 'libavformat/aiffdec.c')
-rw-r--r--libavformat/aiffdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index a3aecee0a8..cc2631448b 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -23,7 +23,7 @@
#include "avformat.h"
#include "pcm.h"
#include "aiff.h"
-#include "caf.h"
+#include "isom.h"
#define AIFF 0
#define AIFF_C_VERSION1 0xA2805140
@@ -257,7 +257,7 @@ static int aiff_read_header(AVFormatContext *s,
case MKTAG('C','H','A','N'):
if (size < 12)
return AVERROR_INVALIDDATA;
- ff_read_chan_chunk(s, size, st->codec);
+ ff_mov_read_chan(s, size, st->codec);
break;
default: /* Jump */
if (size & 1) /* Always even aligned */