[FFmpeg-cvslog] Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
Michael Niedermayer
git at videolan.org
Fri Mar 13 22:14:37 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 13 22:02:19 2015 +0100| [79f013a206394bfc90bbb72995f5cf8965181f51] | committer: Michael Niedermayer
Merge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
* commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
lavc: Improve thread locking error message
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79f013a206394bfc90bbb72995f5cf8965181f51
---
More information about the ffmpeg-cvslog
mailing list