aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-02-13 22:12:54 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-02-14 14:42:55 +0100
commitb54b40b33cd77fb135ae678c7726a1f8636e4b3e (patch)
treea832a57584a864f2cd63a2f74d84b80d07b83a9e /libavcodec
parent29330721b0e8514f9f8b4d54be75a662a2b79e44 (diff)
downloadffmpeg-b54b40b33cd77fb135ae678c7726a1f8636e4b3e.tar.gz
rv40: prevent undefined signed overflow in rv40_loop_filter()
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/rv40.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
index c55a07a7d0..04cc4bcfa9 100644
--- a/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@ -357,7 +357,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row)
* in addition to the coded ones because because they lie at the edge of
* 8x8 block with different enough motion vectors
*/
- int mvmasks[4];
+ unsigned mvmasks[4];
mb_pos = row * s->mb_stride;
for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){
@@ -373,7 +373,8 @@ static void rv40_loop_filter(RV34DecContext *r, int row)
int c_v_deblock[2], c_h_deblock[2];
int clip_left;
int avail[4];
- int y_to_deblock, c_to_deblock[2];
+ unsigned y_to_deblock;
+ int c_to_deblock[2];
q = s->current_picture_ptr->f.qscale_table[mb_pos];
alpha = rv40_alpha_tab[q];