diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 12:53:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 12:53:26 +0200 |
| commit | 2dbc93455c148bbd051549a7ed5c88fb08c853c5 (patch) | |
| tree | 41461a4365556582fe991c06ed4624d4767ef05d /compat | |
| parent | cccb45751e93142d71be78f6bb90bbfb50ee13be (diff) | |
| parent | 80521c1997a23e148edf89e11b939ab8646297ca (diff) | |
| download | ffmpeg-2dbc93455c148bbd051549a7ed5c88fb08c853c5.tar.gz | |
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>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions