[FFmpeg-cvslog] Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 24 12:53:26 2012 +0200| [2dbc93455c148bbd051549a7ed5c88fb08c853c5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2dbc93455c148bbd051549a7ed5c88fb08c853c5
---