Module: libav
Branch: master
Commit: b797f7352055cec199bb087323f20edaa1101369
Author: Martin Storsjö <mar...@martin.st>
Committer: Martin Storsjö <mar...@martin.st>
Date: Tue Dec 20 10:53:18 2011 +0200
vc1dec: Use the right pointer type for the tmp pointer
This fixes warnings about assignment from incompatible
pointer type.
Signed-off-by: Martin Storsjö <mar...@martin.st>
---
libavcodec/vc1dec.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 701a3da..3cb7661 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))
{
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
