From a407baba85c2999707868e975c98b5a9de50f46d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 8 Jan 2012 00:08:52 +0100 Subject: [PATCH] g723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer type [enabled by default]" Signed-off-by: Michael Niedermayer --- libavcodec/g723_1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 9a1e294722..ec70e06f3e 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -985,7 +985,7 @@ static int g723_1_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - out= p->frame.data[0]; + out= (int16_t*)p->frame.data[0]; if(p->cur_frame_type == ActiveFrame) {