FFmpeg/libavformat/tcp.c at e3201c38d53d2b8b24d0bc95d726b2cb1752dc12

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-12-04 14:00:22 +02:00

Files

Michael Niedermayer c5c4e5839a Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'

* commit 'e14f98c62fdf8744b07419314095d1b3248cce75':
  tcp: Clarify the units for the timeout avoptions

Conflicts:
	libavformat/tcp.c

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

2015-02-28 23:20:39 +01:00

6.7 KiB

Raw Blame History

View Raw

6.7 KiB Raw Blame History

6.7 KiB

Raw Blame History