diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-21 02:09:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-21 02:09:27 +0200 |
| commit | 98495152145ce29cbb5147a50648df4e3ac1b468 (patch) | |
| tree | 63a5f42ac6894a5b06cd1b6f9dd7d106d20c430b /libavcodec/h264_cabac.c | |
| parent | e9b1d5ae5e41b854a9d8d212e9e197a193ff1fa9 (diff) | |
| download | ffmpeg-98495152145ce29cbb5147a50648df4e3ac1b468.tar.gz | |
Revert "h264: assembly version of get_cabac for x86_64 with PIC (v4)"
This broke compilation on darwin, revert until a better solution is found.
This reverts commit a812b599b504b39a8021827da89d5e23fb361cc9.
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | 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 6c59d174a2..65f2cb4dc8 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1659,7 +1659,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 +#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS) coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, last_coeff_ctx_base, sig_off); } else { |