Changed subpicture_region_t->picture into a picture_t *
[vlc.git] / modules / codec / kate.c
index 09f2ed2..b8646ae 100644 (file)
@@ -584,8 +584,6 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
         return NULL;
     }
 
-    p_spu->b_pausable = true;
-
     /* these may be 0 for "not specified" */
     p_spu->i_original_picture_width = p_sys->ki.original_canvas_width;
     p_spu->i_original_picture_height = p_sys->ki.original_canvas_height;
@@ -642,7 +640,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
         CreateKatePalette( fmt.p_palette, ev->palette );
 
         /* create the bitmap */
-        CreateKateBitmap( &p_bitmap_region->picture, ev->bitmap );
+        CreateKateBitmap( p_bitmap_region->p_picture, ev->bitmap );
 
         msg_Dbg(p_dec, "Created bitmap, %zux%zu, %zu colors\n", ev->bitmap->width, ev->bitmap->height, ev->palette->ncolors);
     }
@@ -674,17 +672,16 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
     {
         p_bitmap_region->i_align = SUBPICTURE_ALIGN_BOTTOM;
     }
-    p_spu->i_x = 0;
-    p_spu->i_y = 10;
+    p_spu->p_region->i_x = 0;
+    p_spu->p_region->i_y = 10;
 
     /* override if tracker info present */
     if (tracker_valid)
     {
-        p_spu->i_flags = 0;
         if (kin.has.region)
         {
-            p_spu->i_x = kin.region_x;
-            p_spu->i_y = kin.region_y;
+            p_spu->p_region->i_x = kin.region_x;
+            p_spu->p_region->i_y = kin.region_y;
             p_spu->b_absolute = true;
         }