[FFmpeg-cvslog] Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
Michael Niedermayer
git at videolan.org
Mon Mar 16 00:13:07 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 15 23:25:33 2015 +0100| [4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7] | committer: Michael Niedermayer
Merge commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710'
* commit '66028b7ba6b411ba12ef553e9c8f1f4a4fe27710':
udp: Use AVOptions
Conflicts:
libavformat/udp.c
See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7
---
More information about the ffmpeg-cvslog
mailing list