ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 22 12:37:29 2015 +0200| [8fb672b50ae3c5faf75889a2ed8a867af0ddc8a8] | committer: Michael Niedermayer
Merge commit '61dc9d647c6664e11674d9a10fdde29987d6acda' * commit '61dc9d647c6664e11674d9a10fdde29987d6acda': udp: Fix local_port management Conflicts: libavformat/udp.c See: 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fb672b50ae3c5faf75889a2ed8a867af0ddc8a8 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog