ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Oct 6
21:08:55 2014 +0200| [d47dd84391f2a4d9dab36b375019bf05d83a5a29] | committer:
Michael Niedermayer
Merge commit '577899a6458ccad9026eb268f10dc0b39c224c8d'
* commit '577899a6458ccad9026eb268f10dc0b39c224c8d':
lavc: specify the behavior of av_lockmgr_register on failure.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
See: a950edb472e8823e34832c7313ba447b2db76f27
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d47dd84391f2a4d9dab36b375019bf05d83a5a29
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
