diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:30:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:30:57 +0200 |
| commit | 6067186f3a76691bc2c825c40312dc12a7483c0e (patch) | |
| tree | 5364397b38b4ddf1b355d64c228ea69ad0e5bc6e /libavcodec/arm | |
| parent | edf6fb64e07c277a1aad2cd0a57a9b4c1b33c29a (diff) | |
| parent | f407856968dcf4ff6c7240abe3afc17c00d81b46 (diff) | |
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>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/h264cmc_neon.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 3427e36011..15301f8fb9 100644 --- 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 |