From 89cd95b19cdb296e18d1e63641c9494111653581 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 23 Mar 2012 13:11:53 +0000 Subject: [PATCH] sonic: fix warning about incompatible pointer types Signed-off-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/sonic.c | 4 ++-- 1 file 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); -- 2.11.0