summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/libavcodec/h264.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-04 01:05:54 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-04 01:05:54 +0200
commit2c165927caf935cc417f28efcc2dcff271811a38 (patch)
tree9e4c0f548724029a87b7aff11cc7eaa1384609eb /contrib/ffmpeg/libavcodec/h264.c
parent29de55140caf6b28a8147290436981dc90b90333 (diff)
downloadxine-lib-2c165927caf935cc417f28efcc2dcff271811a38.tar.gz
xine-lib-2c165927caf935cc417f28efcc2dcff271811a38.tar.bz2
Apply patch not yet applied upstream to at least get it to build somehow.
Diffstat (limited to 'contrib/ffmpeg/libavcodec/h264.c')
-rw-r--r--contrib/ffmpeg/libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ffmpeg/libavcodec/h264.c b/contrib/ffmpeg/libavcodec/h264.c
index 2750173b1..4d72dc2ff 100644
--- a/contrib/ffmpeg/libavcodec/h264.c
+++ b/contrib/ffmpeg/libavcodec/h264.c
@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
index[coeff_count++] = last;\
}
const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !( defined(ARCH_X86_64) && defined(PIC) )
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);