[FFmpeg-cvslog] Merge commit '9835abb6d63fb07613994ae90e72fef758149408'
Michael Niedermayer
git at videolan.org
Wed Jun 5 12:01:59 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 5 11:56:56 2013 +0200| [82070b01b85f200ec1a76064159f82626c167c12] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82070b01b85f200ec1a76064159f82626c167c12
---
More information about the ffmpeg-cvslog
mailing list