Merge remote-tracking branch 'qatar/master'

[coroid/ffmpeg_saccubus.git] / libavcodec / svq1enc.c

diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index edd6029..c3a1c60 100644 (file)
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -284,11 +284,11 @@ static int svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plane
         s->m.avctx= s->avctx;
         s->m.current_picture_ptr= &s->m.current_picture;
         s->m.last_picture_ptr   = &s->m.last_picture;
-        s->m.last_picture.data[0]= ref_plane;
+        s->m.last_picture.f.data[0] = ref_plane;
         s->m.linesize=
-        s->m.last_picture.linesize[0]=
-        s->m.new_picture.linesize[0]=
-        s->m.current_picture.linesize[0]= stride;
+        s->m.last_picture.f.linesize[0] =
+        s->m.new_picture.f.linesize[0] =
+        s->m.current_picture.f.linesize[0] = stride;
         s->m.width= width;
         s->m.height= height;
         s->m.mb_width= block_width;
@@ -318,9 +318,9 @@ static int svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plane
         s->m.current_picture.mb_mean=   (uint8_t *)s->dummy;
         s->m.current_picture.mb_var=    (uint16_t*)s->dummy;
         s->m.current_picture.mc_mb_var= (uint16_t*)s->dummy;
-        s->m.current_picture.mb_type= s->dummy;
+        s->m.current_picture.f.mb_type = s->dummy;
 
-        s->m.current_picture.motion_val[0]= s->motion_val8[plane] + 2;
+        s->m.current_picture.f.motion_val[0] = s->motion_val8[plane] + 2;
         s->m.p_mv_table= s->motion_val16[plane] + s->m.mb_stride + 1;
         s->m.dsp= s->dsp; //move
         ff_init_me(&s->m);
@@ -328,7 +328,7 @@ static int svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plane
         s->m.me.dia_size= s->avctx->dia_size;
         s->m.first_slice_line=1;
         for (y = 0; y < block_height; y++) {
-            s->m.new_picture.data[0]= src - y*16*stride; //ugly
+            s->m.new_picture.f.data[0] = src - y*16*stride; //ugly
             s->m.mb_y= y;
 
             for(i=0; i<16 && i + 16*y<height; i++){