sonic: fix warning about incompatible pointer types
authorPaul B Mahol <onemda@gmail.com>
Fri, 23 Mar 2012 13:11:53 +0000 (13:11 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Mar 2012 18:03:45 +0000 (19:03 +0100)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sonic.c

index c2697ea..bbedecf 100644 (file)
@@ -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);