ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Apr 24 22:48:29 2015 +0200| [437bdf482e928095c1b43681cfeb231a5d2cd5d6] | committer: Michael Niedermayer
Merge commit '18db1286b04557aa2d2df7efbcb65ae825d5a469' * commit '18db1286b04557aa2d2df7efbcb65ae825d5a469': libxvid: Make codec use the init-cleanup flag and mark it as init-thread-safe Conflicts: libavcodec/libxvid.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=437bdf482e928095c1b43681cfeb231a5d2cd5d6 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog