ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Jun 1
02:25:04 2015 +0200| [6ed8341cb163e4c253449458aa21a0b3aab1e2b6] | committer:
Michael Niedermayer
Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'
* commit '0994e142132200c706f704271b5a7ae81d128f5c':
pthread: Check memory allocation
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ed8341cb163e4c253449458aa21a0b3aab1e2b6
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
