Fix an unused variable warning. Move the update of the loopfilter info to the same block where it is used. GCC 4.5 is not able trace the initialization of the local filter_info across the other calls between the two conditionals on pbi->common and issues an uninitialized variable warning. Change-Id: Ie4487b3714a096b3fb21608f6b0c74e745e3c6fc
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 7fc9010..314a8d7 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c
@@ -296,18 +296,6 @@ } } - if(pbi->common.filter_level) - { - /*update loopfilter info*/ - Segment = (alt_flt_enabled) ? xd->mode_info_context->mbmi.segment_id : 0; - filter_level = pbi->mt_baseline_filter_level[Segment]; - /* Distance of Mb to the various image edges. - * These are specified to 8th pel as they are always compared to values that are in 1/8th pel units - * Apply any context driven MB level adjustment - */ - filter_level = vp8_adjust_mb_lf_value(xd, filter_level); - } - /* Distance of Mb to the various image edges. * These are specified to 8th pel as they are always compared to values that are in 1/8th pel units */ @@ -362,7 +350,16 @@ } } - /* loopfilter on this macroblock. */ + /* update loopfilter info */ + Segment = (alt_flt_enabled) ? xd->mode_info_context->mbmi.segment_id : 0; + filter_level = pbi->mt_baseline_filter_level[Segment]; + /* Distance of Mb to the various image edges. + * These are specified to 8th pel as they are always compared to values that are in 1/8th pel units + * Apply any context driven MB level adjustment + */ + filter_level = vp8_adjust_mb_lf_value(xd, filter_level); + + /* loopfilter on this macroblock. */ if (filter_level) { if (mb_col > 0) @@ -778,18 +775,6 @@ } } - if(pbi->common.filter_level) - { - /* update loopfilter info */ - Segment = (alt_flt_enabled) ? xd->mode_info_context->mbmi.segment_id : 0; - filter_level = pbi->mt_baseline_filter_level[Segment]; - /* Distance of Mb to the various image edges. - * These are specified to 8th pel as they are always compared to values that are in 1/8th pel units - * Apply any context driven MB level adjustment - */ - filter_level = vp8_adjust_mb_lf_value(xd, filter_level); - } - /* Distance of Mb to the various image edges. * These are specified to 8th pel as they are always compared to values that are in 1/8th pel units */ @@ -853,6 +838,15 @@ } } + /* update loopfilter info */ + Segment = (alt_flt_enabled) ? xd->mode_info_context->mbmi.segment_id : 0; + filter_level = pbi->mt_baseline_filter_level[Segment]; + /* Distance of Mb to the various image edges. + * These are specified to 8th pel as they are always compared to values that are in 1/8th pel units + * Apply any context driven MB level adjustment + */ + filter_level = vp8_adjust_mb_lf_value(xd, filter_level); + /* loopfilter on this macroblock. */ if (filter_level) {