[FFmpeg-cvslog] Merge commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f' into release/1.1
Michael Niedermayer
git at videolan.org
Sat Dec 21 02:22:07 CET 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 02:14:24 2013 +0100| [b589b8a7042fa0ba296e0f080c30d853da56b925] | committer: Michael Niedermayer
Merge commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f' into release/1.1
* commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f':
pthread: Fix deadlock during thread initialization
Conflicts:
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b589b8a7042fa0ba296e0f080c30d853da56b925
---
More information about the ffmpeg-cvslog
mailing list