aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-10-30 03:21:48 +0100
committerDiego Biurrun <diego@biurrun.de>2012-11-11 11:06:19 +0100
commitf0d124f005ff02dba56b09fdd5fe2a9ba961f650 (patch)
tree92f7b210a6e0c69b2e9962cef9d64279074d8b74
parent6cd796049dc06eabe1a9714290713bd31024af9e (diff)
downloadffmpeg-f0d124f005ff02dba56b09fdd5fe2a9ba961f650.tar.gz
x86inc: Set program_name outside of x86inc.asm
This reduces the local difference to the x264 upstream version.
-rw-r--r--libavutil/x86/x86inc.asm2
-rw-r--r--libavutil/x86/x86util.asm1
2 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index b0df2b20f0..52ee46ab76 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -35,7 +35,7 @@
; to x264-devel@videolan.org .
%ifndef program_name
- %define program_name ff
+ %define program_name x264
%endif
%define WIN64 0
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 31163eec7b..cf11183e71 100644
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -23,6 +23,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
+%define program_name ff
%define cpuflags_mmxext cpuflags_mmx2
%include "libavutil/x86/x86inc.asm"