git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)
commit	84f77f84234e409271852692e736900ee7b2f0fe
tree	8183ec61854cdc0a5dbc731aeca2ef73309b4ba7	tree \| snapshot
parent	4a522eff006532f28c631f13a604c364102b7a6f	commit \| diff
parent	ec7c51c7868d3ccc66b5cc38bf126258b94f086c	commit \| diff

Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'

* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
avf: move ff_http_match_no_proxy to network

Conflicts:
libavformat/internal.h
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Unnamed repository; edit this file 'description' to name the repository.