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