[FFmpeg-cvslog] isom: fix redundant redeclaration of ff_mov_read_chan().

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Sep 30 01:22:18 2012 +0200| [c4dba58f47a9b1b37458ddb2dd8500b7f3ea4d06] | committer: Clément Bœsch

isom: fix redundant redeclaration of ff_mov_read_chan().

Silence a GCC warning. A leftover of the disabled version is still
available in lavf/isom.c.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4dba58f47a9b1b37458ddb2dd8500b7f3ea4d06
---

 libavformat/aiffdec.c |    1 +
 libavformat/isom.h    |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 41fe0d2..2c2b693 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -28,6 +28,7 @@
 #include "aiff.h"
 #include "isom.h"
 #include "id3v2.h"
+#include "mov_chan.h"
 
 #define AIFF                    0
 #define AIFF_C_VERSION1         0xA2805140
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 875c3a9..06bfbd0 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -204,7 +204,6 @@ int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom);
 enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags);
 
 int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries);
-int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, int64_t size);
 void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout);
 
 #endif /* AVFORMAT_ISOM_H */