virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-24 11:30:23 +02:00
parent edf6fb64e0 f407856968
commit 6067186f3a
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/h264cmc_neon.S
View File

@@ -376,14 +376,12 @@ function ff_\type\()_h264_chroma_mc2_neon, export=1
endfunc endfunc
.endm .endm
#if CONFIG_H264_DECODER
h264_chroma_mc8 put h264_chroma_mc8 put
h264_chroma_mc8 avg h264_chroma_mc8 avg
h264_chroma_mc4 put h264_chroma_mc4 put
h264_chroma_mc4 avg h264_chroma_mc4 avg
h264_chroma_mc2 put h264_chroma_mc2 put
h264_chroma_mc2 avg h264_chroma_mc2 avg
#endif
#if CONFIG_RV40_DECODER #if CONFIG_RV40_DECODER
const rv40bias const rv40bias