From b797f7352055cec199bb087323f20edaa1101369 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 20 Dec 2011 10:53:18 +0200 Subject: vc1dec: Use the right pointer type for the tmp pointer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes warnings about assignment from incompatible pointer type. Signed-off-by: Martin Storsjö --- libavcodec/vc1dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 701a3da956..3cb7661397 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5426,13 +5426,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, AVFrame *pict = data; uint8_t *buf2 = NULL; const uint8_t *buf_start = buf; - uint8_t *tmp; int mb_height, n_slices1; struct { uint8_t *buf; GetBitContext gb; int mby_start; - } *slices = NULL; + } *slices = NULL, *tmp; /* no supplementary picture */ if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == VC1_CODE_ENDOFSEQ)) { -- cgit v1.2.3