diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-20 20:47:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-20 20:47:46 +0200 |
| commit | 4da42ebe4486f2960d64135395b1a9ef705d9429 (patch) | |
| tree | 5e405819aa070d6313851ea324ffaf475523d02f /ffmpeg.c | |
| parent | e632a430fe03dace7380c11e2bd62ea418e63abc (diff) | |
| parent | 005c80b645cc6ab5f30cbc3e10ab66a15dfd107e (diff) | |
| download | ffmpeg-4da42ebe4486f2960d64135395b1a9ef705d9429.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
MS Screen 1 decoder
aacdec: Fix popping channel layouts.
av_gettime: support Win32 without gettimeofday()
Use av_gettime() in various places
Move av_gettime() to libavutil
dct-test: use emms_c() from libavutil instead of duplicating it
mov: fix operator precedence bug
mathematics.h: remove a couple of math defines
Remove unnecessary inclusions of [sys/]time.h
lavf: remove unnecessary inclusions of unistd.h
bfin: libswscale: add const where appropriate to fix warnings
bfin: libswscale: remove unnecessary #includes
udp: Properly check for invalid sockets
tcp: Check the return value from getsockopt
network: Use av_strerror for getting error messages
udp: Properly print error from getnameinfo
mmst: Use AVUNERROR() to convert error codes to the right range for strerror
network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows
rtmp: Reduce the number of idle posts sent by sleeping 50ms
Conflicts:
Changelog
configure
libavcodec/aacdec.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/dct-test.c
libavcodec/version.h
libavformat/riff.c
libavformat/udp.c
libavutil/Makefile
libswscale/bfin/yuv2rgb_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -63,7 +63,6 @@ #if HAVE_SYS_RESOURCE_H #include <sys/types.h> -#include <sys/time.h> #include <sys/resource.h> #elif HAVE_GETPROCESSTIMES #include <windows.h> |