From 22b125f91285b8b46932890eb9be52496fd88de1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 16 Feb 2012 23:03:58 +0100 Subject: [PATCH] g729dec: fix 'warning: assignment from incompatible pointer type' Signed-off-by: Michael Niedermayer --- libavcodec/g729dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index bdc9b68dbf..b38945cd6c 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -420,7 +420,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - out_frame= ctx->frame.data[0]; + out_frame = (int16_t*) ctx->frame.data[0]; if (buf_size == 10) { packet_type = FORMAT_G729_8K;