diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-02-17 18:20:17 -0800 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 15:18:56 +0100 |
commit | 71ae8d50b283732143cb5e319b09878a4738d3be (patch) | |
tree | eebd77b8af13c5dc34560144028f36353fdf0cd9 | |
parent | 51513b98d62de2514d657acc95cb69f2e92aa212 (diff) | |
download | ffmpeg-71ae8d50b283732143cb5e319b09878a4738d3be.tar.gz |
x86/dsputil: fix compilation when h263 decoder/encoder are disabled.
The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but
the h263 loopfilter functions (in the .asm file) are not optimized
out (even though their function pointers are never assigned).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/x86/dsputil.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm index f5df52112a..19acd8fec9 100644 --- a/libavcodec/x86/dsputil.asm +++ b/libavcodec/x86/dsputil.asm @@ -653,7 +653,7 @@ BSWAP32_BUF INIT_XMM ssse3 BSWAP32_BUF - +%if CONFIG_H263_DECODER || CONFIG_H263_ENCODER %macro H263_LOOP_FILTER 5 pxor m7, m7 mova m0, [%1] @@ -813,3 +813,4 @@ cglobal h263_h_loop_filter, 3,5,0,32 punpckhdq m6, m6 movd [r4+r3], m6 RET +%endif ; CONFIG_H263_DECODER || CONFIG_H263_ENCODER |