summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-12-20 10:53:18 +0200
committerMartin Storsjö <martin@martin.st>2011-12-20 11:04:26 +0200
commitb797f7352055cec199bb087323f20edaa1101369 (patch)
tree8951ba3b4e6772a13dc42f020f57c9f7caf90860
parent729ebb2f185244b0ff06d48edbbbbb02ceb4ed4e (diff)
vc1dec: Use the right pointer type for the tmp pointer
This fixes warnings about assignment from incompatible pointer type. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/vc1dec.c3
1 files changed, 1 insertions, 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)) {