ffmpeg/libavformat/http.c at 2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-21 05:21:09 +01:00

Files

Michael Niedermayer 689a1bd917 Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'

* commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1':
  http: Pass options through to the nested protocol

Conflicts:
	libavformat/http.c

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

2013-09-27 10:38:04 +02:00

36 KiB

Raw Blame History

View Raw

36 KiB Raw Blame History

36 KiB

Raw Blame History