Merge remote-tracking branch 'qatar/master'

* qatar/master: arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 6067186f3a
parent edf6fb64e0 f407856968
commit 6067186f3a
1 changed files with 0 additions and 2 deletions
--- a/libavcodec/arm/h264cmc_neon.S
+++ b/libavcodec/arm/h264cmc_neon.S
@ -376,14 +376,12 @@ function ff_\type\()_h264_chroma_mc2_neon, export=1
 endfunc
 .endm

-#if CONFIG_H264_DECODER
        h264_chroma_mc8 put
        h264_chroma_mc8 avg
        h264_chroma_mc4 put
        h264_chroma_mc4 avg
        h264_chroma_mc2 put
        h264_chroma_mc2 avg
-#endif

 #if CONFIG_RV40_DECODER
 const   rv40bias