Michael Niedermayer
4da42ebe44
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>
2012-06-20 20:47:46 +02:00
2012-06-19 20:53:27 +02:00
2012-06-11 21:12:39 +02:00
2012-06-13 22:43:57 +02:00
2012-06-18 20:07:00 +02:00
2012-06-11 21:40:43 +02:00
2012-06-17 00:53:06 +00:00
2012-06-17 00:53:06 +00:00
2012-06-08 23:59:09 +02:00
2012-06-06 18:35:05 +02:00
2012-06-20 09:35:58 -07:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-05-26 20:59:57 +02:00
2012-06-03 01:53:36 +02:00
2012-05-22 23:42:17 +02:00
2012-05-22 23:42:17 +02:00
2012-05-22 23:42:17 +02:00
2012-05-20 16:29:07 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-20 20:47:46 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-05-29 21:33:28 +02:00
2012-05-29 21:33:28 +02:00
2012-06-18 21:44:22 +02:00
2012-06-08 23:59:09 +02:00
2012-06-20 20:47:46 +02:00
2012-06-04 00:33:42 +02:00
2012-05-28 15:58:46 +02:00
2012-05-28 18:20:39 +02:00
2012-06-02 19:56:10 +02:00
2012-06-09 10:43:20 +00:00
2012-06-12 20:47:38 +00:00
2012-06-04 00:33:42 +02:00
2012-05-28 17:24:13 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-19 20:53:27 +02:00
2012-06-12 20:47:38 +00:00
2012-05-18 23:34:11 +02:00
2012-06-20 20:47:46 +02:00
2012-06-19 20:53:27 +02:00
2012-06-09 20:09:43 +02:00
2012-06-01 12:14:49 +02:00
2012-06-19 20:53:27 +02:00
2012-06-19 20:53:27 +02:00
2012-05-16 03:10:16 +02:00
2012-06-04 20:42:00 +02:00
2012-06-18 20:07:00 +02:00
2012-06-18 20:07:00 +02:00
2012-05-25 00:38:16 +02:00
2012-06-12 20:47:38 +00:00
2012-05-30 12:07:41 +00:00
2012-06-20 20:47:46 +02:00
2012-06-12 20:47:38 +00:00
2012-06-14 15:48:43 +00:00
2012-05-20 16:29:08 +02:00
2012-05-25 13:40:12 +02:00
2012-06-01 23:22:54 +02:00
2012-05-18 23:34:11 +02:00
2012-06-14 15:48:43 +00:00
2012-05-18 23:34:11 +02:00
2012-05-31 16:59:25 +02:00
2012-06-12 14:33:39 -04:00
2012-06-17 00:53:06 +00:00
2012-06-07 21:31:22 +02:00
2012-06-07 21:32:32 +02:00
2012-05-25 13:40:12 +02:00
2012-05-30 16:42:01 +02:00
2012-06-07 21:07:17 +02:00
2012-06-10 02:24:25 +02:00
2012-05-31 20:25:23 +02:00
2012-05-31 20:25:23 +02:00
2012-06-18 21:44:48 +02:00
2012-06-17 00:53:06 +00:00
2012-06-17 00:53:06 +00:00
2012-06-09 20:30:17 +02:00
2012-06-19 01:36:30 +02:00
2012-05-16 22:32:05 +02:00
2012-06-09 20:30:17 +02:00
2012-05-31 05:07:51 +02:00
2012-06-17 21:32:43 +02:00
2012-05-25 13:40:12 +02:00
2012-06-17 00:38:39 +02:00
2012-05-21 14:56:12 +02:00
2012-05-20 22:58:04 +02:00
2012-06-10 23:27:17 +02:00
2012-06-15 12:10:25 +00:00
2012-06-12 20:47:38 +00:00
2012-05-18 23:34:11 +02:00
2012-05-29 21:33:28 +02:00
2012-06-04 20:01:36 +02:00
2012-05-28 17:24:13 +02:00
2012-06-12 20:47:38 +00:00
2012-06-17 00:53:06 +00:00
2012-06-19 20:43:28 +00:00
2012-06-10 21:34:15 +02:00
2012-06-09 23:34:15 +00:00
2012-06-12 20:47:38 +00:00
2012-06-19 16:44:34 +02:00
2012-05-18 23:34:11 +02:00
2012-06-12 22:12:26 +00:00
2012-06-12 22:12:26 +00:00
2012-06-11 02:06:43 +02:00
2012-06-14 21:55:13 +02:00
2012-06-11 21:12:39 +02:00
2012-06-03 15:01:34 +02:00
2012-06-20 20:47:46 +02:00
2012-06-15 18:42:10 +02:00
2012-06-20 18:19:53 +02:00
2012-06-20 18:20:04 +02:00
2012-06-14 21:55:13 +02:00
2012-06-17 00:53:06 +00:00
2012-06-15 03:14:07 +02:00
2012-06-20 20:47:46 +02:00
2012-05-28 17:24:13 +02:00
2012-06-02 23:43:31 +02:00
2012-06-06 13:09:02 +02:00
2012-05-22 14:59:02 +02:00
2012-05-31 20:25:23 +02:00
2012-05-25 13:40:12 +02:00
2012-06-04 07:41:22 +02:00
2012-05-20 22:58:04 +02:00
2012-06-16 17:58:40 +02:00
2012-06-19 21:38:18 +02:00
2012-06-17 00:38:39 +02:00
2012-06-14 21:55:13 +02:00
2012-05-25 13:40:12 +02:00
2012-06-17 17:09:34 +02:00
2012-06-20 20:47:46 +02:00
2012-05-25 13:40:12 +02:00
2012-06-08 23:59:09 +02:00
2012-06-19 17:22:07 +02:00
2012-05-30 19:32:06 +02:00
2012-05-17 23:45:00 +02:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-04 12:18:56 +02:00
2012-06-15 00:14:21 +02:00
2012-06-06 21:18:14 +02:00
2012-06-01 00:35:06 +02:00
2012-06-19 16:44:35 +02:00
2012-05-28 19:05:15 +02:00
2012-05-28 19:05:15 +02:00
2012-06-08 23:59:09 +02:00
2012-05-22 23:42:17 +02:00
2012-06-10 23:36:22 +02:00
2012-06-19 20:53:27 +02:00
2012-06-05 12:13:39 +02:00
2012-06-19 01:36:17 +02:00
2012-06-07 20:51:07 +02:00
2012-06-08 18:24:47 +02:00
2012-06-11 20:13:31 +02:00
2012-06-19 17:13:45 +02:00
2012-05-22 23:42:17 +02:00
2012-06-01 01:14:49 +02:00
2012-05-22 11:56:18 +00:00
2012-06-08 11:44:50 +02:00
2012-05-22 23:42:17 +02:00
2012-06-18 20:07:00 +02:00
2012-06-18 20:07:00 +02:00
2012-06-18 20:07:00 +02:00
2012-06-18 20:23:53 +02:00
2012-06-17 00:53:06 +00:00
2012-05-29 21:33:28 +02:00
2012-06-07 18:01:09 +02:00
2012-06-10 15:40:24 +02:00
2012-05-30 16:20:22 +02:00
2012-05-16 22:32:05 +02:00
2012-06-08 23:59:09 +02:00
2012-06-19 20:53:27 +02:00
2012-06-18 09:01:35 +02:00
2012-06-13 22:43:57 +02:00
2012-06-08 23:59:09 +02:00
2012-06-20 20:47:46 +02:00
2012-06-06 01:08:33 +02:00
2012-06-06 01:08:33 +02:00
2012-06-18 20:07:00 +02:00
2012-06-06 01:08:33 +02:00
2012-06-17 19:50:58 +02:00
2012-05-31 21:27:42 +02:00
2012-06-14 02:38:35 +00:00
2012-06-17 00:53:06 +00:00
2012-06-17 00:53:06 +00:00
2012-06-06 21:18:47 +02:00
2012-06-01 23:22:54 +02:00
2012-05-28 17:24:13 +02:00
2012-05-23 19:04:23 +02:00
2012-06-01 15:52:20 +02:00
4da42ebe44