Michael Niedermayer
03678a32bc
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
lavf: Add a fate test for the noproxy pattern matching
lavf: Handle the environment variable no_proxy more properly
Conflicts:
libavformat/Makefile
libavformat/internal.h
libavformat/tls.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-28 13:13:04 +01:00
2013-02-06 10:21:52 +01:00
2012-11-29 13:24:48 +00:00
2012-11-23 17:30:05 +00:00
2012-10-27 00:26:35 +02:00
2012-11-27 19:07:18 +00:00
2012-11-07 13:03:50 +00:00
2012-12-24 09:17:45 +01:00
2012-09-02 18:15:08 +02:00
2012-11-23 17:30:05 +00:00
2012-10-12 20:56:54 +02:00
2012-11-17 08:45:47 +01:00
2012-11-17 08:45:47 +01:00
2012-11-17 08:45:47 +01:00
2012-11-17 19:47:56 +01:00
2012-12-11 11:34:47 +00:00
2012-12-31 13:53:21 +01:00
2013-02-06 14:53:49 +01:00
2013-02-20 04:13:33 +01:00
2013-02-20 04:13:33 +01:00
2012-10-03 16:51:30 +02:00
2013-01-11 23:44:04 +01:00
2013-02-17 17:36:27 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2013-02-20 04:13:33 +01:00
2013-01-18 13:54:38 +01:00
2012-12-19 03:13:26 +01:00
2012-12-05 00:01:17 +01:00
2012-12-15 12:41:24 +01:00
2012-12-15 12:41:24 +01:00
2013-02-16 09:09:38 +01:00
2013-02-16 09:09:38 +01:00
2013-01-01 23:48:41 +01:00
2013-02-06 10:21:52 +01:00
2013-02-24 19:27:26 +00:00
2013-02-24 19:27:26 +00:00
2013-02-24 19:27:26 +00:00
2013-02-24 19:27:26 +00:00
2013-01-15 23:18:07 +02:00
2013-01-09 14:49:07 -05:00
2013-01-08 18:47:09 +00:00
2012-10-03 03:49:24 +02:00
2012-11-07 01:51:24 +01:00
2012-10-03 16:51:30 +02:00
2012-10-08 09:06:25 +00:00
2013-02-14 17:48:08 +01:00
2012-10-23 02:19:38 +02:00
2012-10-23 02:19:38 +02:00
2012-10-23 02:19:38 +02:00
2012-10-03 16:51:30 +02:00
2012-11-16 14:12:37 +01:00
2012-11-05 02:20:52 +01:00
2012-10-03 16:51:30 +02:00
2013-01-01 14:02:54 +00:00
2013-02-27 21:32:14 +02:00
2012-10-03 16:51:30 +02:00
2013-02-06 16:40:59 +01:00
2012-10-03 16:51:30 +02:00
2013-02-23 00:18:34 +01:00
2012-11-06 16:18:30 +00:00
2013-02-06 10:21:52 +01:00
2012-10-03 16:51:30 +02:00
2013-01-18 13:54:38 +01:00
2013-01-10 17:54:47 +01:00
2013-01-21 00:13:43 +02:00
2013-01-02 21:48:56 +01:00
2012-12-30 23:37:14 +01:00
2013-02-23 00:24:02 +01:00
2012-12-31 00:41:35 +01:00
2013-02-21 00:59:32 +01:00
2012-12-30 22:37:25 +01:00
2012-12-30 23:09:49 +01:00
2012-12-30 23:09:49 +01:00
2012-12-30 23:55:28 +01:00
2012-12-30 21:39:36 +01:00
2013-01-03 07:25:47 +01:00
2012-12-31 00:01:58 +01:00
2012-12-30 22:46:42 +01:00
2013-01-03 07:46:30 +01:00
2013-01-13 13:54:52 +01:00
2012-10-09 14:16:34 +03:00
2012-10-16 18:51:16 +02:00
2013-01-10 17:54:47 +01:00
2013-02-08 00:10:29 +01:00
2012-09-15 20:26:47 +02:00
2013-02-14 00:46:28 +01:00
2012-09-07 01:36:21 +02:00
2012-10-03 16:51:30 +02:00
2012-10-03 16:51:30 +02:00
2012-10-15 08:32:34 +02:00
2012-10-03 16:51:30 +02:00
2013-02-06 10:21:52 +01:00
2013-02-06 16:40:59 +01:00
2012-12-10 11:19:42 -05:00
03678a32bc