RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Clément Bœsch 2012-09-30 01:22:18 +02:00
parent 2308c5bb25
commit c4dba58f47
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/aiffdec.c
View File

@ -28,6 +28,7 @@
#include "aiff.h" #include "aiff.h"
#include "isom.h" #include "isom.h"
#include "id3v2.h" #include "id3v2.h"
#include "mov_chan.h"
#define AIFF 0 #define AIFF 0
#define AIFF_C_VERSION1 0xA2805140 #define AIFF_C_VERSION1 0xA2805140

1
libavformat/isom.h
View File

@ -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); 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_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); void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout);
#endif /* AVFORMAT_ISOM_H */ #endif /* AVFORMAT_ISOM_H */