Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Aug 2012 16:13:00 +0000 (18:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Aug 2012 16:13:00 +0000 (18:13 +0200)
commit8579d4b2f0cc7d46dc75e0a0e42d556d653463fc
tree8ab65fc1ed0ff0371f552430a33f5ebf57bc5dea
parent1c66807636ed8da5cf81d75cc8bb2726c6d6bc21
parent7baa115a33ab516c85ac94f6c5cdaee73e65ddf8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: export filtered -lz flag in config.mak
  build: add separate setting for host linker
  configure: probe_cc: use separate variable for linker output flag
  x86: Always compile files with functions that are called unconditionally
  x86: mpegvideoenc: fix linking with --disable-mmx
  x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation

Conflicts:
Makefile
configure
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Makefile
common.mak
configure
libavcodec/x86/Makefile
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/mpegvideoenc_template.c