generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler warning when CONFIG_ACCOUNTING enabled.

Browse Source 
ISO C90 forbids mixed declarations and code and the function
 aom_accounting_set_context() was being called before the MB_MODE_INFO
 declaration.

Change-Id: I8619525b1b2fd37753891bd310d9d59c881b8807
This commit is contained in:
Nathan E. Egge
2016-10-05 19:30:15 -04:00
committed by Yaowu Xu
parent 5f34b61903
commit ebbd479e18
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
av1/decoder/decodeframe.c
View File

@@ -1167,11 +1167,12 @@ static void decode_block(AV1Decoder *const pbi, MACROBLOCKD *const xd,
const int bh = 1 << (bhl - 1); const int bh = 1 << (bhl - 1);
const int x_mis = AOMMIN(bw, cm->mi_cols - mi_col); const int x_mis = AOMMIN(bw, cm->mi_cols - mi_col);
const int y_mis = AOMMIN(bh, cm->mi_rows - mi_row); const int y_mis = AOMMIN(bh, cm->mi_rows - mi_row);
MB_MODE_INFO *mbmi;
#if CONFIG_ACCOUNTING #if CONFIG_ACCOUNTING
aom_accounting_set_context(&pbi->accounting, mi_col, mi_row); aom_accounting_set_context(&pbi->accounting, mi_col, mi_row);
#endif #endif
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
MB_MODE_INFO *mbmi;
if (supertx_enabled) { if (supertx_enabled) {
mbmi = set_mb_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis); mbmi = set_mb_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis);
} else { } else {
@@ -1183,8 +1184,8 @@ static void decode_block(AV1Decoder *const pbi, MACROBLOCKD *const xd,
#endif #endif
av1_read_mode_info(pbi, xd, supertx_enabled, mi_row, mi_col, r, x_mis, y_mis); av1_read_mode_info(pbi, xd, supertx_enabled, mi_row, mi_col, r, x_mis, y_mis);
#else #else
MB_MODE_INFO *mbmi = set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, mbmi = set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis, bwl,
y_mis, bwl, bhl); bhl);
#if CONFIG_EXT_PARTITION_TYPES #if CONFIG_EXT_PARTITION_TYPES
xd->mi[0]->mbmi.partition = partition; xd->mi[0]->mbmi.partition = partition;
#endif #endif