aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2010-06-30 06:50:44 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2010-06-30 06:50:44 +0000
commit85b76ce9901120b7a2ed9ab607dff8daa43e1b0d (patch)
tree5672be022383f62701a3fb9bfb74702fe7c88241
parentdd025f25daeaa81e1cb815fb86d307eeef821727 (diff)
downloadffmpeg-85b76ce9901120b7a2ed9ab607dff8daa43e1b0d.tar.gz
Fix "initialization from incompatible pointer type" warning in rv34.
Patch by Eli Friedman (at gmail). Originally committed as revision 23897 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/rv34.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index fa3f23f58e..7dbc0c374a 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1142,7 +1142,7 @@ static int rv34_set_deblock_coef(RV34DecContext *r)
MpegEncContext *s = &r->s;
int hmvmask = 0, vmvmask = 0, i, j;
int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
- int16_t (*motion_val)[2] = s->current_picture_ptr->motion_val[0][midx];
+ int16_t (*motion_val)[2] = &s->current_picture_ptr->motion_val[0][midx];
for(j = 0; j < 16; j += 8){
for(i = 0; i < 2; i++){
if(is_mv_diff_gt_3(motion_val + i, 1))