comparison dvbsubdec.c @ 6916:603bdc5d8493 libavcodec

minor simplification
author michael
date Wed, 28 May 2008 01:34:46 +0000
parents 77ce2329f620
children e943e1409077
comparison
equal deleted inserted replaced
6915:77ce2329f620 6916:603bdc5d8493
272 display = region->display_list; 272 display = region->display_list;
273 273
274 object = get_object(ctx, display->object_id); 274 object = get_object(ctx, display->object_id);
275 275
276 if (object) { 276 if (object) {
277 obj_disp = object->display_list;
278 obj_disp_ptr = &object->display_list; 277 obj_disp_ptr = &object->display_list;
278 obj_disp = *obj_disp_ptr;
279 279
280 while (obj_disp && obj_disp != display) { 280 while (obj_disp && obj_disp != display) {
281 obj_disp_ptr = &obj_disp->object_list_next; 281 obj_disp_ptr = &obj_disp->object_list_next;
282 obj_disp = obj_disp->object_list_next; 282 obj_disp = *obj_disp_ptr;
283 } 283 }
284 284
285 if (obj_disp) { 285 if (obj_disp) {
286 *obj_disp_ptr = obj_disp->object_list_next; 286 *obj_disp_ptr = obj_disp->object_list_next;
287 287
288 if (!object->display_list) { 288 if (!object->display_list) {
289 obj2 = ctx->object_list;
290 obj2_ptr = &ctx->object_list; 289 obj2_ptr = &ctx->object_list;
290 obj2 = *obj2_ptr;
291 291
292 while (obj2 != object) { 292 while (obj2 != object) {
293 assert(obj2); 293 assert(obj2);
294 obj2_ptr = &obj2->next; 294 obj2_ptr = &obj2->next;
295 obj2 = obj2->next; 295 obj2 = *obj2_ptr;
296 } 296 }
297 297
298 *obj2_ptr = obj2->next; 298 *obj2_ptr = obj2->next;
299 299
300 av_free(obj2); 300 av_free(obj2);