1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 82070b01b8 Merge commit '9835abb6d63fb07613994ae90e72fef758149408'
* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
	libavformat/network.c
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05 11:56:56 +02:00
..
2013-05-10 16:10:52 -03:00
2013-04-07 03:59:44 +02:00
2013-04-08 14:15:10 +02:00
2013-05-15 16:53:35 +02:00
2013-04-15 12:13:41 +02:00
2013-05-29 10:40:13 +00:00
2013-04-17 00:37:05 +02:00
2013-06-04 13:08:23 +02:00
2013-04-20 00:05:35 +02:00
2013-04-19 14:44:58 +02:00
2013-04-18 00:24:25 +02:00
2013-05-16 23:20:07 +02:00
2013-05-24 15:36:54 +02:00
2013-05-17 14:19:18 +00:00
2013-05-23 14:46:01 +02:00
2013-05-17 15:11:23 +02:00
2013-04-04 04:04:24 +02:00
2013-03-31 16:10:52 +02:00
2013-05-01 11:56:34 +02:00
2013-05-01 11:56:34 +02:00
2013-04-17 02:16:58 +02:00
2013-05-18 07:12:56 +02:00
2013-05-10 16:53:50 -03:00
2013-05-26 15:48:50 +02:00
2013-06-03 23:04:43 +00:00
2013-04-05 14:30:56 +00:00
2013-05-22 15:20:22 +02:00
2013-05-24 15:36:54 +02:00
2013-05-29 18:14:43 +00:00
2013-06-02 11:25:56 +02:00