[FFmpeg-cvslog] x86/dsputil: fix compilation when h263 decoder/encoder are disabled.

Ronald S. Bultje git at videolan.org
Mon Feb 18 15:26:45 CET 2013


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sun Feb 17 18:20:17 2013 -0800| [71ae8d50b283732143cb5e319b09878a4738d3be] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71ae8d50b283732143cb5e319b09878a4738d3be
---

 libavcodec/x86/dsputil.asm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
index f5df521..19acd8f 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



More information about the ffmpeg-cvslog mailing list