diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-09-30 01:22:18 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-10-02 00:26:15 +0200 |
| commit | c4dba58f47a9b1b37458ddb2dd8500b7f3ea4d06 (patch) | |
| tree | 12fd2defba959ab2711f085469d116d06f434152 | |
| parent | 2308c5bb250c39ea8ab3df1fe41346d6dc5a3dc4 (diff) | |
| download | ffmpeg-c4dba58f47a9b1b37458ddb2dd8500b7f3ea4d06.tar.gz | |
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.
| -rw-r--r-- | libavformat/aiffdec.c | 1 | ||||
| -rw-r--r-- | libavformat/isom.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 41fe0d2994..2c2b693d14 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 875c3a9fdf..06bfbd0776 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 */ |