Mercurial > libavcodec.hg
changeset 4745:25dd62b93846 libavcodec
Fix compilation when using the --disable-opts parameter. This to help those
interested in using a debugger to debug FFmpeg.
Original thread:
Subject: [PATCH] Fix compilation when using --disable-opts
Date: 2007-03-15 16:58:35 GMT
| author | takis |
|---|---|
| date | Thu, 29 Mar 2007 14:20:30 +0000 |
| parents | 00f7cd30636f |
| children | 4aedb3b6fa4e |
| files | cabac.h h264.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cabac.h Thu Mar 29 09:39:20 2007 +0000 +++ b/cabac.h Thu Mar 29 14:20:30 2007 +0000 @@ -376,7 +376,7 @@ #define BYTE "16" #define BYTEEND "20" #endif -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) int bit; #ifndef BRANCHLESS_CABAC_DECODER @@ -680,7 +680,7 @@ //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard) -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ void *end= significant_coeff_ctx_base + max_coeff - 1; int minusstart= -(int)significant_coeff_ctx_base;
--- a/h264.c Thu Mar 29 09:39:20 2007 +0000 +++ b/h264.c Thu Mar 29 14:20:30 2007 +0000 @@ -6111,7 +6111,7 @@ index[coeff_count++] = last;\ } const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); } else { coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);