Commit d8e7f2c9 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge
Browse files

Fix compiler warning when CONFIG_ACCOUNTING enabled.

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
parent ec8093ab
...@@ -446,11 +446,12 @@ static void decode_block(AV1Decoder *const pbi, MACROBLOCKD *const xd, ...@@ -446,11 +446,12 @@ static void decode_block(AV1Decoder *const pbi, MACROBLOCKD *const xd,
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 = set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis,
y_mis, bwl, bhl);
#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
MB_MODE_INFO *mbmi = set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis,
y_mis, bwl, bhl);
if (bsize >= BLOCK_8X8 && (cm->subsampling_x || cm->subsampling_y)) { if (bsize >= BLOCK_8X8 && (cm->subsampling_x || cm->subsampling_y)) {
const BLOCK_SIZE uv_subsize = const BLOCK_SIZE uv_subsize =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment