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
..
acodec	lswr: Improve default resampler's default parameters	2013-01-04 16:47:57 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2013-02-28 13:13:04 +01:00
lavf	movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd	2013-02-14 17:48:08 +01:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	fate: update pixfmts_hflip	2013-02-25 13:16:44 +00:00
seek	ff_gen_search: Fix finding the maximum timestamp in a really small file	2013-02-18 20:37:17 +01:00
vsynth	movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd	2013-02-14 17:48:08 +01:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00