aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g729dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-16 23:03:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-16 23:25:51 +0100
commit22b125f91285b8b46932890eb9be52496fd88de1 (patch)
tree2a1b3cf87a903fca84ec46d6a45d0a7a4c3c3080 /libavcodec/g729dec.c
parent934abf6ff88c386918b0b57584bf81c4d8a0ea49 (diff)
downloadffmpeg-22b125f91285b8b46932890eb9be52496fd88de1.tar.gz
g729dec: fix 'warning: assignment from incompatible pointer type'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g729dec.c')
-rw-r--r--libavcodec/g729dec.c2
1 files changed, 1 insertions, 1 deletions
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;