• Michael Niedermayer's avatar
    Merge commit '80521c19' · 2dbc9345
    Michael Niedermayer authored
    * commit '80521c19':
      build: allow targets to specify extra objects to link with executables
      swscale: avoid pointless use of compound literals
      libm: add fallbacks for various single-precision functions
      network: use getservbyport() only if available
      network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN
      Include sys/time.h before sys/resource.h
    
    Conflicts:
    	Makefile
    	configure
    	libavutil/libm.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2dbc9345
Makefile 5.25 KB