aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-02-01 15:03:40 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-02-01 15:03:40 +0000
commit3ffabd4e4967b3c41e0af7ae5a54d43a5625a78b (patch)
treec27f2bbfdec898081d4fc3a9d25e463544376cc1
parent5d44b2a13874ef0718b522713a0b0199a7b8438c (diff)
downloadffmpeg-3ffabd4e4967b3c41e0af7ae5a54d43a5625a78b.tar.gz
Silence two pointer assignment compiler warnings in rv34.c
Originally committed as revision 16916 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/rv34.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 47b03d11d5..1f35b24a55 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -223,7 +223,7 @@ static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table)
int ones;
static const int cbp_masks[3] = {0x100000, 0x010000, 0x110000};
static const int shifts[4] = { 0, 2, 8, 10 };
- int *curshift = shifts;
+ const int *curshift = shifts;
int i, t, mask;
code = get_vlc2(gb, vlc->cbppattern[table].table, 9, 2);
@@ -883,7 +883,7 @@ static void rv34_pred_4x4_block(RV34DecContext *r, uint8_t *dst, int stride, int
}
if(!right && up){
topleft = dst[-stride + 3] * 0x01010101;
- prev = &topleft;
+ prev = (uint8_t*)&topleft;
}
r->h.pred4x4[itype](dst, prev, stride);
}