diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 13:38:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 13:38:38 +0100 |
| commit | 1dad4867146007486d6e84e59454734d1fc804c5 (patch) | |
| tree | 84d90dde2ff8ec5c8bec330aab43f05dd5025ade /libavutil | |
| parent | 1c755f76676eeaebbeb8763390c679a9b735c334 (diff) | |
| parent | 9ce02e14f01de50fcc6f7f459544b140be66d615 (diff) | |
| download | ffmpeg-1dad4867146007486d6e84e59454734d1fc804c5.tar.gz | |
Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'
* commit '9ce02e14f01de50fcc6f7f459544b140be66d615':
x86: ac3dsp: port to cpuflags
x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
x86inc: Only define program_name if the macro is unset
Conflicts:
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 4 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index c1827fbbad..01d7655a17 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -34,7 +34,9 @@ ; as this feature might be useful for others as well. Send patches or ideas ; to x264-devel@videolan.org . -%define program_name ff +%ifndef program_name + %define program_name ff +%endif %define WIN64 0 %define UNIX64 0 diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 74abcbecab..89e8cd82f4 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -23,6 +23,8 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** +%define cpuflags_mmxext cpuflags_mmx2 + %include "libavutil/x86/x86inc.asm" %macro SBUTTERFLY 4 |