Re: [libav-devel] [PATCH 2/4] x86inc: Only define program_name if the macro is unset

2012-10-31 Thread Diego Biurrun
On Tue, Oct 30, 2012 at 03:28:35AM +0100, Diego Biurrun wrote:
> This allows overriding the value from outside of the file.
> ---
> 
> I consider this change fit for upstream.  Loren?  Jason?
> 
>  libavutil/x86/x86inc.asm |4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)

Accepted for x264 by Loren.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


[libav-devel] [PATCH 2/4] x86inc: Only define program_name if the macro is unset

2012-10-29 Thread Diego Biurrun
This allows overriding the value from outside of the file.
---

I consider this change fit for upstream.  Loren?  Jason?

 libavutil/x86/x86inc.asm |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index 1fe9f55..b0df2b2 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-de...@videolan.org .
 
-%define program_name ff
+%ifndef program_name
+%define program_name ff
+%endif
 
 %define WIN64  0
 %define UNIX64 0
-- 
1.7.1

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel