Mercurial > libavcodec.hg
comparison rv34.c @ 8721:42e258f2b931 libavcodec
Silence two pointer assignment compiler warnings in rv34.c
author | kostya |
---|---|
date | Sun, 01 Feb 2009 15:03:40 +0000 |
parents | e9d9d946f213 |
children | f471abd09fef |
comparison
equal
deleted
inserted
replaced
8720:052c676c433b | 8721:42e258f2b931 |
---|---|
221 { | 221 { |
222 int pattern, code, cbp=0; | 222 int pattern, code, cbp=0; |
223 int ones; | 223 int ones; |
224 static const int cbp_masks[3] = {0x100000, 0x010000, 0x110000}; | 224 static const int cbp_masks[3] = {0x100000, 0x010000, 0x110000}; |
225 static const int shifts[4] = { 0, 2, 8, 10 }; | 225 static const int shifts[4] = { 0, 2, 8, 10 }; |
226 int *curshift = shifts; | 226 const int *curshift = shifts; |
227 int i, t, mask; | 227 int i, t, mask; |
228 | 228 |
229 code = get_vlc2(gb, vlc->cbppattern[table].table, 9, 2); | 229 code = get_vlc2(gb, vlc->cbppattern[table].table, 9, 2); |
230 pattern = code & 0xF; | 230 pattern = code & 0xF; |
231 code >>= 4; | 231 code >>= 4; |
881 if(itype == HOR_UP_PRED) itype = HOR_UP_PRED_RV40_NODOWN; | 881 if(itype == HOR_UP_PRED) itype = HOR_UP_PRED_RV40_NODOWN; |
882 if(itype == VERT_LEFT_PRED) itype = VERT_LEFT_PRED_RV40_NODOWN; | 882 if(itype == VERT_LEFT_PRED) itype = VERT_LEFT_PRED_RV40_NODOWN; |
883 } | 883 } |
884 if(!right && up){ | 884 if(!right && up){ |
885 topleft = dst[-stride + 3] * 0x01010101; | 885 topleft = dst[-stride + 3] * 0x01010101; |
886 prev = &topleft; | 886 prev = (uint8_t*)&topleft; |
887 } | 887 } |
888 r->h.pred4x4[itype](dst, prev, stride); | 888 r->h.pred4x4[itype](dst, prev, stride); |
889 } | 889 } |
890 | 890 |
891 /** add_pixels_clamped for 4x4 block */ | 891 /** add_pixels_clamped for 4x4 block */ |