diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:18:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:20:25 +0100 |
commit | ed8ff70d9ee02b9940803aee69462da548df663b (patch) | |
tree | 495891dd23a7f45f12682670719fe00a2c26fef0 /libavutil/x86/emms.asm | |
parent | b45e0c2573fa5ce8c4821605f35ac4cad946e9d3 (diff) | |
parent | 822b0728f0e3c3ba60b20bd4fd971d5c4a3fe3e9 (diff) | |
download | ffmpeg-ed8ff70d9ee02b9940803aee69462da548df663b.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Drop some unused macro definitions
x86: Add a Yasm-based emms() replacement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/emms.asm')
-rw-r--r-- | libavutil/x86/emms.asm | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm new file mode 100644 index 0000000000..0aad34af3f --- /dev/null +++ b/libavutil/x86/emms.asm @@ -0,0 +1,30 @@ +;***************************************************************************** +;* Copyright (C) 2013 Martin Storsjo +;* +;* This file is part of FFmpeg. +;* +;* FFmpeg is free software; you can redistribute it and/or +;* modify it under the terms of the GNU Lesser General Public +;* License as published by the Free Software Foundation; either +;* version 2.1 of the License, or (at your option) any later version. +;* +;* FFmpeg is distributed in the hope that it will be useful, +;* but WITHOUT ANY WARRANTY; without even the implied warranty of +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;* Lesser General Public License for more details. +;* +;* You should have received a copy of the GNU Lesser General Public +;* License along with FFmpeg; if not, write to the Free Software +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** + +%include "x86util.asm" + +SECTION .text + +;----------------------------------------------------------------------------- +; void avpriv_emms_yasm(void) +;----------------------------------------------------------------------------- +cvisible emms_yasm, 0, 0 + emms + RET |