OSDN Git Service

minor simplification
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2008 01:34:46 +0000 (01:34 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2008 01:34:46 +0000 (01:34 +0000)
Originally committed as revision 13485 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/dvbsubdec.c

index 96c99ee..47fea45 100644 (file)
@@ -274,25 +274,25 @@ static void delete_region_display_list(DVBSubContext *ctx, DVBSubRegion *region)
         object = get_object(ctx, display->object_id);
 
         if (object) {
-            obj_disp = object->display_list;
             obj_disp_ptr = &object->display_list;
+            obj_disp = *obj_disp_ptr;
 
             while (obj_disp && obj_disp != display) {
                 obj_disp_ptr = &obj_disp->object_list_next;
-                obj_disp = obj_disp->object_list_next;
+                obj_disp = *obj_disp_ptr;
             }
 
             if (obj_disp) {
                 *obj_disp_ptr = obj_disp->object_list_next;
 
                 if (!object->display_list) {
-                    obj2 = ctx->object_list;
                     obj2_ptr = &ctx->object_list;
+                    obj2 = *obj2_ptr;
 
                     while (obj2 != object) {
                         assert(obj2);
                         obj2_ptr = &obj2->next;
-                        obj2 = obj2->next;
+                        obj2 = *obj2_ptr;
                     }
 
                     *obj2_ptr = obj2->next;