[FFmpeg-cvslog] Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 23:45:42 2013 +0200| [84f77f84234e409271852692e736900ee7b2f0fe] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84f77f84234e409271852692e736900ee7b2f0fe
---