diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-11 12:41:48 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-30 18:15:53 -0400 |
| commit | f47f7efd14fa57e298886a20920b7679c975afc1 (patch) | |
| tree | 7f30b8255ec437ec22666e13b48da79852c2fd71 /libavcodec/dpcm.c | |
| parent | 8d77d12a2be10e8564599ccbfcdd804ff432d885 (diff) | |
| download | ffmpeg-f47f7efd14fa57e298886a20920b7679c975afc1.tar.gz | |
dpcm: replace short with int16_t
Diffstat (limited to 'libavcodec/dpcm.c')
| -rw-r--r-- | libavcodec/dpcm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index fc38abdb7a..3ddc676a72 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -43,7 +43,7 @@ typedef struct DPCMContext { int channels; - short roq_square_array[256]; + int16_t roq_square_array[256]; int sample[2]; ///< previous sample (for SOL_DPCM) const int *sol_table;//for SOL_DPCM } DPCMContext; @@ -115,7 +115,6 @@ static av_cold int dpcm_decode_init(AVCodecContext *avctx) { DPCMContext *s = avctx->priv_data; int i; - short square; if (avctx->channels < 1 || avctx->channels > 2) { av_log(avctx, AV_LOG_INFO, "invalid number of channels\n"); @@ -130,7 +129,7 @@ static av_cold int dpcm_decode_init(AVCodecContext *avctx) case CODEC_ID_ROQ_DPCM: /* initialize square table */ for (i = 0; i < 128; i++) { - square = i * i; + int16_t square = i * i; s->roq_square_array[i ] = square; s->roq_square_array[i + 128] = -square; } @@ -179,7 +178,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, int predictor[2]; int ch = 0; int stereo = s->channels - 1; - short *output_samples = data; + int16_t *output_samples = data; if (!buf_size) return 0; |