diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-11 16:35:48 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-11 16:35:48 +0000 |
| commit | 0c1a9edad463bd6e22b30c19b700b099c7093fc1 (patch) | |
| tree | d16ccbe29c8dbfc2cdc4e92cac31b22c181ed940 /libavcodec/adpcm.c | |
| parent | 4596673c062e3834b6d31d1e8e210b64d74ce26b (diff) | |
| download | ffmpeg-0c1a9edad463bd6e22b30c19b700b099c7093fc1.tar.gz | |
* UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index e31c682339..9f02d4c877 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -329,14 +329,14 @@ static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble) static int adpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - UINT8 *buf, int buf_size) + uint8_t *buf, int buf_size) { ADPCMContext *c = avctx->priv_data; ADPCMChannelStatus *cs; int n, m, channel; int block_predictor[2]; short *samples; - UINT8 *src; + uint8_t *src; int st; /* stereo */ samples = data; @@ -500,7 +500,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, *data_size = 0; return -1; } - *data_size = (UINT8 *)samples - (UINT8 *)data; + *data_size = (uint8_t *)samples - (uint8_t *)data; return src - buf; } |