ffmpeg/libavformat/noproxy-test.c at 901b0f1a219e96d008c801dbd99bb21aae0aea4e

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01: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