From c6f0cdd1bb6b5428e9277fbd61007e30a078bde3 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Wed, 16 Jun 2010 11:36:54 +0300 Subject: [PATCH] Revert "dvbsub.c : Don't fill region if page_state == 0" This reverts commit 57527c545a4cc51e6dbf1c15c8fb63c9b9da455d. Didn't mean to commit this one at this point. --- modules/codec/dvbsub.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c index a434003bbf..fb7619cfa4 100644 --- a/modules/codec/dvbsub.c +++ b/modules/codec/dvbsub.c @@ -840,8 +840,7 @@ static void decode_region_composition( decoder_t *p_dec, bs_t *s ) int i_segment_length, i_processed_length, i_id, i_version; int i_width, i_height, i_level_comp, i_depth, i_clut; int i_8_bg, i_4_bg, i_2_bg; - bool b_region_fill, b_fill = false; - dvbsub_page_t *p_page = p_sys->p_page; + bool b_fill; i_segment_length = bs_read( s, 16 ); i_id = bs_read( s, 8 ); @@ -878,7 +877,7 @@ static void decode_region_composition( decoder_t *p_dec, bs_t *s ) /* Region attributes */ p_region->i_id = i_id; p_region->i_version = i_version; - b_region_fill = bs_read( s, 1 ); + b_fill = bs_read( s, 1 ); bs_skip( s, 3 ); /* Reserved */ i_width = bs_read( s, 16 ); @@ -918,10 +917,6 @@ static void decode_region_composition( decoder_t *p_dec, bs_t *s ) p_region->i_depth = 0; b_fill = true; } - else - if (b_region_fill && p_page->i_state != 0) - b_fill = true; - if( p_region->i_depth && ( ( p_region->i_depth != i_depth ) || ( p_region->i_level_comp != i_level_comp ) || -- 2.39.2