[FFmpeg-cvslog] x86inc: Set program_name outside of x86inc.asm

Diego Biurrun git at videolan.org
Mon Nov 12 11:07:51 CET 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Oct 30 03:21:48 2012 +0100| [f0d124f005ff02dba56b09fdd5fe2a9ba961f650] | committer: Diego Biurrun

x86inc: Set program_name outside of x86inc.asm

This reduces the local difference to the x264 upstream version.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0d124f005ff02dba56b09fdd5fe2a9ba961f650
---

 libavutil/x86/x86inc.asm  |    2 +-
 libavutil/x86/x86util.asm |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index b0df2b2..52ee46a 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -35,7 +35,7 @@
 ; to x264-devel at 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 31163ee..cf11183 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"



More information about the ffmpeg-cvslog mailing list