[FFmpeg-cvslog] h264_cabac: synchronize decode_significance_*_x86 conditionals
Diego Biurrun
git at videolan.org
Thu Dec 22 02:05:03 CET 2011
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Dec 20 18:57:30 2011 +0100| [8742a4ff87b5d6ff9f8b5095a29f2e7e7147b5d8] | committer: Diego Biurrun
h264_cabac: synchronize decode_significance_*_x86 conditionals
The definition and the call site where under different #ifdefs.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8742a4ff87b5d6ff9f8b5095a29f2e7e7147b5d8
---
libavcodec/h264_cabac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index bb0a0ee..fdeb1ba 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 {
More information about the ffmpeg-cvslog
mailing list