Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jan 2013 12:01:06 +0000 (13:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jan 2013 12:01:06 +0000 (13:01 +0100)
* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
  x86inc: Rename "program_name" to "private_prefix"
  configure: Run SHFLAGS through ldflags_filter()

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavutil/x86/x86inc.asm
libavutil/x86/x86util.asm
libswscale/x86/input.asm

diff --cc configure
+++ b/configure
@@@ -4384,11 -3891,10 +4384,11 @@@ LD_LIB=$LD_LI
  LD_PATH=$LD_PATH
  DLLTOOL=$dlltool
  LDFLAGS=$LDFLAGS
 -LDFLAGS-avserver=$AVSERVERLDFLAGS
 +LDFLAGS-ffserver=$FFSERVERLDFLAGS
- SHFLAGS=$SHFLAGS
+ SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
  YASMFLAGS=$YASMFLAGS
  BUILDSUF=$build_suffix
 +PROGSSUF=$progs_suffix
  FULLNAME=$FULLNAME
  LIBPREF=$LIBPREF
  LIBSUF=$LIBSUF
Simple merge
Simple merge
Simple merge