FFmpeg/libavformat/noproxy-test.c at b33d58c31f210d6409a54f3adb6e9a3d0c1642f6

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00

Files

Michael Niedermayer 84f77f8423 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>

2013-06-16 23:45:42 +02:00

1.5 KiB

Raw Blame History

View Raw

1.5 KiB Raw Blame History

1.5 KiB

Raw Blame History