diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2008-02-01 13:51:06 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-02-01 13:51:06 +0000 |
commit | 0ff4670a215cadbfb7b28a1f06e8ef4bd3e90507 (patch) | |
tree | e279e6b36c0ea3b04ddc45ffd5f51f91fcb3c193 /libavcodec/mpc7.c | |
parent | 96711ecff9ccfe9d124548416394a86902fdc90e (diff) | |
download | ffmpeg-0ff4670a215cadbfb7b28a1f06e8ef4bd3e90507.tar.gz |
Casts to silcence "incompatible pointer type" warnings.
Originally committed as revision 11733 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpc7.c')
-rw-r--r-- | libavcodec/mpc7.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 21154d0194..14e5c11516 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -59,7 +59,7 @@ static int mpc7_decode_init(AVCodecContext * avctx) memset(c->oldDSCF, 0, sizeof(c->oldDSCF)); av_init_random(0xDEADBEEF, &c->rnd); dsputil_init(&c->dsp, avctx); - c->dsp.bswap_buf(buf, avctx->extradata, 4); + c->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)avctx->extradata, 4); ff_mpc_init(); init_get_bits(&gb, buf, 128); @@ -175,7 +175,7 @@ static int mpc7_decode_frame(AVCodecContext * avctx, } bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE); - c->dsp.bswap_buf(bits, buf + 4, (buf_size - 4) >> 2); + c->dsp.bswap_buf((uint32_t*)bits, (const uint32_t*)(buf + 4), (buf_size - 4) >> 2); init_get_bits(&gb, bits, (buf_size - 4)* 8); skip_bits(&gb, buf[0]); |