[FFmpeg-cvslog] g723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer type [enabled by default]"

Michael Niedermayer git at videolan.org
Sun Jan 8 00:30:38 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  8 00:08:52 2012 +0100| [a407baba85c2999707868e975c98b5a9de50f46d] | committer: Michael Niedermayer

g723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer type [enabled by default]"

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

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

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

diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index 9a1e294..ec70e06 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) {



More information about the ffmpeg-cvslog mailing list