diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-03-23 13:11:53 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 19:03:45 +0100 |
| commit | 89cd95b19cdb296e18d1e63641c9494111653581 (patch) | |
| tree | da253715d81a4dae52d5747b77750310b027ea78 /libavcodec/sonic.c | |
| parent | ae03b2141e451f0a3330566f2f2c8e3b9186c2ad (diff) | |
| download | ffmpeg-89cd95b19cdb296e18d1e63641c9494111653581.tar.gz | |
sonic: fix warning about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sonic.c')
| -rw-r--r-- | libavcodec/sonic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index c2697ea82c..bbedecf6f2 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -860,7 +860,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, SonicContext *s = avctx->priv_data; GetBitContext gb; int i, quant, ch, j, ret; - short *samples; + int16_t *samples; if (buf_size == 0) return 0; @@ -869,7 +869,7 @@ static int sonic_decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples = s->frame.data[0]; + samples = (int16_t *)s->frame.data[0]; // av_log(NULL, AV_LOG_INFO, "buf_size: %d\n", buf_size); |