diff options
| author | Måns Rullgård <mans@mansr.com> | 2005-02-24 19:08:50 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-02-24 19:08:50 +0000 |
| commit | 88730be65153f4a59916d971842fdaed3e0fd72b (patch) | |
| tree | 1f49c5812d2382abb53df216aab8cabc3c3f56b9 /libavcodec/faad.c | |
| parent | 53513831da58cae7603dc01270c1cf8e4252eba0 (diff) | |
| download | ffmpeg-88730be65153f4a59916d971842fdaed3e0fd72b.tar.gz | |
kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/faad.c')
| -rw-r--r-- | libavcodec/faad.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/faad.c b/libavcodec/faad.c index 236b250d5d..eff051bd45 100644 --- a/libavcodec/faad.c +++ b/libavcodec/faad.c @@ -86,7 +86,7 @@ typedef struct { faacDecFrameInfo *hInfo, unsigned char *buffer, unsigned long buffer_size); - unsigned char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); + char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); #endif void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); @@ -126,11 +126,6 @@ static int faac_init_mp4(AVCodecContext *avctx) return r; } -static int faac_init_aac(AVCodecContext *avctx) -{ - return 0; -} - static int faac_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) @@ -239,7 +234,7 @@ static int faac_decode_init(AVCodecContext *avctx) unsigned char*))); dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*, unsigned char*, unsigned long))); - dfaac(GetErrorMessage, (unsigned char* FAADAPI (*)(unsigned char))); + dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char))); #endif #undef dfacc |