[FFmpeg-cvslog] Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'
Michael Niedermayer
git at videolan.org
Tue Jul 30 11:57:19 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 11:51:14 2013 +0200| [0b712f5d5e5f1552940ea1ad074f6298f6397a24] | committer: Michael Niedermayer
Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'
* commit '74972220909787af5a3ffe66f7fa8041827c2bd2':
rtpproto: Support more than one SSM include address, support excludes
Conflicts:
libavformat/rtpproto.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b712f5d5e5f1552940ea1ad074f6298f6397a24
---
More information about the ffmpeg-cvslog
mailing list