aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-12-20 18:57:30 +0100
committerDiego Biurrun <diego@biurrun.de>2011-12-21 09:04:25 +0100
commit8742a4ff87b5d6ff9f8b5095a29f2e7e7147b5d8 (patch)
tree63127e02bfd9a7601e2600d904ad6991da2d3c84
parent2003a29284660255016b1ec4bd5dfb8d53e6a852 (diff)
downloadffmpeg-8742a4ff87b5d6ff9f8b5095a29f2e7e7147b5d8.tar.gz
h264_cabac: synchronize decode_significance_*_x86 conditionals
The definition and the call site where under different #ifdefs.
-rw-r--r--libavcodec/h264_cabac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index bb0a0ee732..fdeb1ba470 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1656,7 +1656,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block,
index[coeff_count++] = last;\
}
const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
-#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)
+#if ARCH_X86 && HAVE_6REGS && !defined(BROKEN_RELOCATIONS)
coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index,
last_coeff_ctx_base, sig_off);
} else {