Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)
commit84f77f84234e409271852692e736900ee7b2f0fe
tree8183ec61854cdc0a5dbc731aeca2ef73309b4ba7
parent4a522eff006532f28c631f13a604c364102b7a6f
parentec7c51c7868d3ccc66b5cc38bf126258b94f086c
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>
libavformat/internal.h
libavformat/network.c
libavformat/network.h
libavformat/noproxy-test.c
libavformat/utils.c