[FFmpeg-cvslog] g729dec: fix 'warning: assignment from incompatible pointer type'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 16 23:03:58 2012 +0100| [22b125f91285b8b46932890eb9be52496fd88de1] | committer: Michael Niedermayer

g729dec: fix 'warning: assignment from incompatible pointer type'

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22b125f91285b8b46932890eb9be52496fd88de1
---

 libavcodec/g729dec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index bdc9b68..b38945c 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;