ffmpeg/libavformat
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
..
2014-08-24 11:05:42 +00:00
2014-12-18 00:10:35 +01:00
2013-10-13 20:13:38 +00:00
2013-10-18 19:53:47 +02:00
2013-12-25 17:14:32 +01:00
2014-10-20 10:38:38 +01:00
2013-10-06 19:36:53 +02:00
2014-08-30 15:50:22 +00:00
2015-02-26 02:06:10 +01:00
2014-08-24 11:05:42 +00:00
2014-06-18 14:55:28 +02:00
2014-06-03 10:58:19 -08:00
2015-02-16 19:59:04 +01:00
2014-04-16 19:41:41 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-07-03 15:46:26 +02:00
2014-07-13 19:18:31 +02:00
2014-07-13 19:18:31 +02:00
2014-08-15 22:47:45 +02:00
2014-09-30 20:21:14 +02:00
2015-02-27 16:55:34 +01:00
2013-11-13 22:56:18 +01:00
2015-01-30 09:33:49 +00:00
2015-02-17 12:16:43 -05:00
2014-12-18 23:27:07 +01:00
2015-02-15 18:20:54 +01:00
2014-08-24 11:05:42 +00:00
2013-12-25 17:38:29 +01:00
2014-12-20 00:17:43 +01:00
2015-02-21 23:37:24 +02:00
2014-10-21 03:52:27 +02:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2014-09-30 20:21:14 +02:00
2014-10-22 23:12:38 +02:00
2014-03-08 12:36:57 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00
2014-08-24 11:05:42 +00:00