diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 00:08:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-08 00:18:36 +0100 |
| commit | a407baba85c2999707868e975c98b5a9de50f46d (patch) | |
| tree | 9de771718e4154d11067bcce24630bf7d4a43d11 /libavcodec | |
| parent | 53918a1c54b49e76c3ca517e2caada8372995712 (diff) | |
| download | ffmpeg-a407baba85c2999707868e975c98b5a9de50f46d.tar.gz | |
g723_1: Fix "libavcodec/g723_1.c:988:8: warning: assignment from incompatible pointer type [enabled by default]"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | 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 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) { |