ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Feb 28
23:20:39 2015 +0100| [c5c4e5839ad1459bdbd69ffa7d33949577662a6c] | committer:
Michael Niedermayer
Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
* commit 'e14f98c62fdf8744b07419314095d1b3248cce75':
tcp: Clarify the units for the timeout avoptions
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5c4e5839ad1459bdbd69ffa7d33949577662a6c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
