[FFmpeg-cvslog] Merge commit '57c36de7265761dd94fb6bb4a9180011f796128f' into release/0.10
Michael Niedermayer
git at videolan.org
Wed Mar 11 21:37:03 CET 2015
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 21:29:31 2015 +0100| [3832db1223999819e2846284292ea6f3ef1b1c49] | committer: Michael Niedermayer
Merge commit '57c36de7265761dd94fb6bb4a9180011f796128f' into release/0.10
* commit '57c36de7265761dd94fb6bb4a9180011f796128f':
vp8: avoid race condition on segment map.
Conflicts:
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3832db1223999819e2846284292ea6f3ef1b1c49
---
More information about the ffmpeg-cvslog
mailing list