Mercurial > libavcodec.hg
comparison faad.c @ 2522:e25782262d7d libavcodec
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
author | michael |
---|---|
date | Thu, 24 Feb 2005 19:08:50 +0000 |
parents | c28b03fea50f |
children | 511e3afc43e1 |
comparison
equal
deleted
inserted
replaced
2521:d3885f927bc7 | 2522:e25782262d7d |
---|---|
84 unsigned long *samplerate, unsigned char *channels); | 84 unsigned long *samplerate, unsigned char *channels); |
85 void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, | 85 void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder, |
86 faacDecFrameInfo *hInfo, | 86 faacDecFrameInfo *hInfo, |
87 unsigned char *buffer, | 87 unsigned char *buffer, |
88 unsigned long buffer_size); | 88 unsigned long buffer_size); |
89 unsigned char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); | 89 char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode); |
90 #endif | 90 #endif |
91 | 91 |
92 void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); | 92 void FAADAPI (*faacDecClose)(faacDecHandle hDecoder); |
93 | 93 |
94 | 94 |
122 r, samplerate, (long)channels, avctx->extradata_size); | 122 r, samplerate, (long)channels, avctx->extradata_size); |
123 avctx->sample_rate = samplerate; | 123 avctx->sample_rate = samplerate; |
124 avctx->channels = channels; | 124 avctx->channels = channels; |
125 | 125 |
126 return r; | 126 return r; |
127 } | |
128 | |
129 static int faac_init_aac(AVCodecContext *avctx) | |
130 { | |
131 return 0; | |
132 } | 127 } |
133 | 128 |
134 static int faac_decode_frame(AVCodecContext *avctx, | 129 static int faac_decode_frame(AVCodecContext *avctx, |
135 void *data, int *data_size, | 130 void *data, int *data_size, |
136 uint8_t *buf, int buf_size) | 131 uint8_t *buf, int buf_size) |
237 dfaac(Init2, (char FAADAPI (*)(faacDecHandle, unsigned char*, | 232 dfaac(Init2, (char FAADAPI (*)(faacDecHandle, unsigned char*, |
238 unsigned long, unsigned long*, | 233 unsigned long, unsigned long*, |
239 unsigned char*))); | 234 unsigned char*))); |
240 dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*, | 235 dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*, |
241 unsigned char*, unsigned long))); | 236 unsigned char*, unsigned long))); |
242 dfaac(GetErrorMessage, (unsigned char* FAADAPI (*)(unsigned char))); | 237 dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char))); |
243 #endif | 238 #endif |
244 #undef dfacc | 239 #undef dfacc |
245 | 240 |
246 #ifdef CONFIG_FAADBIN | 241 #ifdef CONFIG_FAADBIN |
247 break; | 242 break; |