minor simplification
Originally committed as revision 13485 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8403c543de
commit
dd72228e53
@ -274,25 +274,25 @@ static void delete_region_display_list(DVBSubContext *ctx, DVBSubRegion *region)
|
|||||||
object = get_object(ctx, display->object_id);
|
object = get_object(ctx, display->object_id);
|
||||||
|
|
||||||
if (object) {
|
if (object) {
|
||||||
obj_disp = object->display_list;
|
|
||||||
obj_disp_ptr = &object->display_list;
|
obj_disp_ptr = &object->display_list;
|
||||||
|
obj_disp = *obj_disp_ptr;
|
||||||
|
|
||||||
while (obj_disp && obj_disp != display) {
|
while (obj_disp && obj_disp != display) {
|
||||||
obj_disp_ptr = &obj_disp->object_list_next;
|
obj_disp_ptr = &obj_disp->object_list_next;
|
||||||
obj_disp = obj_disp->object_list_next;
|
obj_disp = *obj_disp_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj_disp) {
|
if (obj_disp) {
|
||||||
*obj_disp_ptr = obj_disp->object_list_next;
|
*obj_disp_ptr = obj_disp->object_list_next;
|
||||||
|
|
||||||
if (!object->display_list) {
|
if (!object->display_list) {
|
||||||
obj2 = ctx->object_list;
|
|
||||||
obj2_ptr = &ctx->object_list;
|
obj2_ptr = &ctx->object_list;
|
||||||
|
obj2 = *obj2_ptr;
|
||||||
|
|
||||||
while (obj2 != object) {
|
while (obj2 != object) {
|
||||||
assert(obj2);
|
assert(obj2);
|
||||||
obj2_ptr = &obj2->next;
|
obj2_ptr = &obj2->next;
|
||||||
obj2 = obj2->next;
|
obj2 = *obj2_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
*obj2_ptr = obj2->next;
|
*obj2_ptr = obj2->next;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user