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/ac3dec.c | |
| parent | 4596673c062e3834b6d31d1e8e210b64d74ce26b (diff) | |
* UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 6352f55c7a..62a7cdfaf3 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -22,8 +22,8 @@ /* currently, I use libac3 which is Copyright (C) Aaron Holtzman and released under the GPL license. I may reimplement it someday... */ typedef struct AC3DecodeState { - UINT8 inbuf[4096]; /* input buffer */ - UINT8 *inbuf_ptr; + uint8_t inbuf[4096]; /* input buffer */ + uint8_t *inbuf_ptr; int frame_size; int flags; int channels; @@ -53,7 +53,7 @@ static inline int blah (int32_t i) return i - 0x43c00000; } -static inline void float_to_int (float * _f, INT16 * s16, int nchannels) +static inline void float_to_int (float * _f, int16_t * s16, int nchannels) { int i, j, c; int32_t * f = (int32_t *) _f; // XXX assumes IEEE float format @@ -72,10 +72,10 @@ static inline void float_to_int (float * _f, INT16 * s16, int nchannels) static int ac3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - UINT8 *buf, int buf_size) + uint8_t *buf, int buf_size) { AC3DecodeState *s = avctx->priv_data; - UINT8 *buf_ptr; + uint8_t *buf_ptr; int flags, i, len; int sample_rate, bit_rate; short *out_samples = data; @@ -151,7 +151,7 @@ static int ac3_decode_frame(AVCodecContext *avctx, } s->inbuf_ptr = s->inbuf; s->frame_size = 0; - *data_size = 6 * avctx->channels * 256 * sizeof(INT16); + *data_size = 6 * avctx->channels * 256 * sizeof(int16_t); break; } } |