diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-22 05:09:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-22 13:48:40 +0200 |
| commit | 79bf1f0ad03f17bb00913fdef6e955d3c46c8a92 (patch) | |
| tree | a0711686d7bd4edfe0c17d64a79b2cdf3853b9ad /libavcodec/rawdec.c | |
| parent | 225efccefcf342dfdb37a61ff86fce537be9f524 (diff) | |
| download | ffmpeg-79bf1f0ad03f17bb00913fdef6e955d3c46c8a92.tar.gz | |
rawdec: fix "warning: assignment from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 50bd7f377e..75b578359e 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -208,7 +208,7 @@ static int raw_decode(AVCodecContext *avctx, return res; if((avctx->pix_fmt==PIX_FMT_PAL8 && buf_size < context->length) || (av_pix_fmt_descriptors[avctx->pix_fmt].flags & PIX_FMT_PSEUDOPAL)) { - frame->data[1]= context->palette; + frame->data[1]= (uint8_t*)context->palette; } if (avctx->pix_fmt == PIX_FMT_PAL8) { const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); |