diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-01-26 12:19:34 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-01-29 00:10:53 +0100 |
| commit | c59211b437aaaf2592bc20bd26c6cf526fd4fb64 (patch) | |
| tree | 3d93710f77041d8772d3ef5fee1993dfc06313cb /libavcodec/x86 | |
| parent | 438ea561ade14299f9ea22202a07020870487e09 (diff) | |
| download | ffmpeg-streaming-c59211b437aaaf2592bc20bd26c6cf526fd4fb64.zip ffmpeg-streaming-c59211b437aaaf2592bc20bd26c6cf526fd4fb64.tar.gz | |
x86: Simplify some arch conditionals
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/idct_sse2_xvid.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 64af8fe..be4eaa9 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -544,7 +544,7 @@ void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) SET_QPEL_FUNCS(avg_h264_qpel, 1, 8, mmxext, ); SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, mmxext, ); } else if (bit_depth == 10) { -#if !ARCH_X86_64 +#if ARCH_X86_32 SET_QPEL_FUNCS(avg_h264_qpel, 0, 16, 10_mmxext, ff_); SET_QPEL_FUNCS(put_h264_qpel, 0, 16, 10_mmxext, ff_); SET_QPEL_FUNCS(put_h264_qpel, 1, 8, 10_mmxext, ff_); diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index fe2478e..f083a2c 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -377,7 +377,7 @@ inline void ff_idct_xvid_sse2(short *block) JZ("%%esi", "1f") "5: \n\t" iMTX_MULT("7*16(%0)", MANGLE(iTab2), ROUND(walkenIdctRounders+5*16), PUT_ODD(ROW7)) -#if !ARCH_X86_64 +#if ARCH_X86_32 iLLM_HEAD #endif iLLM_PASS("%0") |
