Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 10:53:26 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 10:53:26 +0000 (12:53 +0200)
commit2dbc93455c148bbd051549a7ed5c88fb08c853c5
tree41461a4365556582fe991c06ed4624d4767ef05d
parentcccb45751e93142d71be78f6bb90bbfb50ee13be
parent80521c1997a23e148edf89e11b939ab8646297ca
Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

* commit '80521c1997a23e148edf89e11b939ab8646297ca':
  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: Michael Niedermayer <michaelni@gmx.at>
Makefile
cmdutils.c
configure
ffmpeg.c
libavcodec/aacps_tablegen.h
libavformat/network.h
libavformat/os_support.c
libavutil/libm.h
library.mak
libswscale/swscale_unscaled.c