Reapply 1be46ef6b. Include vpx_config.asm and prefix functions with vpx. BUG=webm:1679
Unified · Split
| @@ -8,3 +8,5 @@ x264/libav's framework for x86 assembly. Contains a variety of macros and · 7 unmodified lines | |||
| 8 | defines that help automatically allow assembly to work cross-platform. | 8 | defines that help automatically allow assembly to work cross-platform. |
| 9 | 9 | ||
| 10 | Local Modifications: | 10 | Local Modifications: |
| 11 | Get configuration from vpx_config.asm. | ||
| 12 | Prefix functions with vpx by default. | ||
| @@ -34,8 +34,10 @@ · 33 unmodified lines | |||
| 34 | ; as this feature might be useful for others as well. Send patches or ideas | 34 | ; as this feature might be useful for others as well. Send patches or ideas |
| 35 | ; to x264-devel@videolan.org . | 35 | ; to x264-devel@videolan.org . |
| 36 | 36 | ||
| 37 | %include "vpx_config.asm" | ||
| 38 | |||
| 37 | %ifndef private_prefix | 39 | %ifndef private_prefix |
| 38 | %define private_prefix x264 | 40 | %define private_prefix vpx |
| 39 | %endif | 41 | %endif |
| 40 | 42 | ||
| 41 | %ifndef public_prefix | 43 | %ifndef public_prefix |