eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cd3d0d5422356a748e8b20edc79c22182cca7ec1
ffmpeg/libavformat/tcp.c
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
Reference in New Issue View Git Blame Copy Permalink