diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-28 00:48:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-28 02:38:33 +0100 |
| commit | 0e5fbbd7768a6eb42809c08a5dd46093caf407d3 (patch) | |
| tree | e559aec3cdf6f48bb9774fb0cf4bb51b270cda70 /libavcodec/x86/h264_i386.h | |
| parent | ad1c50255735c20bd86572d3e8b3c88a5ca6c8f1 (diff) | |
| parent | bd96be6e2739dbe5b7a467a318ebfb6241c15eba (diff) | |
| download | ffmpeg-0e5fbbd7768a6eb42809c08a5dd46093caf407d3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: K&R cosmetics
doxygen: remove unreplaced variables from custom header and footer
threads: test for sys/param.h and include it for sysctl on OpenBSD
v4l2: remove unneded linux specific asm/types.h include
x86: Fix constraints for decode_significance*_x86
Conflicts:
libavcodec/mpegvideo_enc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index 0bc6a611f1..510f726ba1 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 HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) +#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS) static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index, x86_reg last_off){ @@ -144,6 +144,6 @@ static int decode_significance_8x8_x86(CABACContext *c, ); return coeff_count; } -#endif /* HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) */ +#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */ #endif /* AVCODEC_X86_H264_I386_H */ |