diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-06-22 21:42:09 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-06-22 21:45:03 +0200 |
| commit | 81ef892ca8a85f0ab6058a3ed40c05a82a151ba5 (patch) | |
| tree | df3936870d3e48db9ab1889e3559c95b4f6eefbc /libavcodec | |
| parent | c956907eca740f609a4e19d32b43a01fbaedff75 (diff) | |
| download | ffmpeg-streaming-81ef892ca8a85f0ab6058a3ed40c05a82a151ba5.zip ffmpeg-streaming-81ef892ca8a85f0ab6058a3ed40c05a82a151ba5.tar.gz | |
Use HAVE_TEN_OPERANDS for new decode_significance* functions.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 3975a61..a373edb 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1647,7 +1647,7 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT 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_7REGS && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) && HAVE_TEN_OPERANDS coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, last_coeff_ctx_base-significant_coeff_ctx_base, sig_off); } else { diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index c2477ac..982e8aa 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -36,7 +36,7 @@ //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet //as that would make optimization work hard) -#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) +#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) && HAVE_TEN_OPERANDS static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index, x86_reg last_off){ |
