aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv40.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-07-01 15:08:02 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-07-01 15:08:02 +0000
commit39c601b5e7e03ae13d1946149ace7c8b617c7ef3 (patch)
tree3beb34e957e41634394173e0c8c1e79db5fe1fc7 /libavcodec/rv40.c
parent06a497afabd04cbb7f8c7e069a2ac740b3e585ff (diff)
downloadffmpeg-39c601b5e7e03ae13d1946149ace7c8b617c7ef3.tar.gz
RV3/4 intra types array causes alignment issues (at least on ARM5), thus change
its stride and offset to always have align 4. Originally committed as revision 19316 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv40.c')
-rw-r--r--libavcodec/rv40.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
index 2eeae302e6..c20a85ecda 100644
--- a/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@ -164,7 +164,7 @@ static int rv40_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t
int pattern;
int8_t *ptr;
- for(i = 0; i < 4; i++, dst += s->b4_stride){
+ for(i = 0; i < 4; i++, dst += r->intra_types_stride){
if(!i && s->first_slice_line){
pattern = get_vlc2(gb, aic_top_vlc.table, AIC_TOP_BITS, 1);
dst[0] = (pattern >> 2) & 2;
@@ -181,8 +181,8 @@ static int rv40_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t
* The second one (used for retrieving only one coefficient) is
* top + 10 * left.
*/
- A = ptr[-s->b4_stride + 1]; // it won't be used for the last coefficient in a row
- B = ptr[-s->b4_stride];
+ A = ptr[-r->intra_types_stride + 1]; // it won't be used for the last coefficient in a row
+ B = ptr[-r->intra_types_stride];
C = ptr[-1];
pattern = A + (B << 4) + (C << 8);
for(k = 0; k < MODE2_PATTERNS_NUM; k++)