Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:20:39 +0000 (23:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:20:39 +0000 (23:20 +0100)
commitc5c4e5839ad1459bdbd69ffa7d33949577662a6c
tree14d617f6e00b12a8698572e4d025ba77f96607fe
parent1fb3642317768c02db0eaf8d0d118d37a970f091
parente14f98c62fdf8744b07419314095d1b3248cce75
Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'

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

Conflicts:
libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/tcp.c