• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8579d4b2
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8579d4b2
Makefile 4.32 KB