[FFmpeg-cvslog] Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'

Michael Niedermayer git at videolan.org
Mon Apr 13 20:19:33 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 13 19:59:41 2015 +0200| [fb6dd77000f1ad6740494269f55a0ff21df5bcf2] | committer: Michael Niedermayer

Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'

* commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc':
  ffv1: Check memory allocations

Conflicts:
	libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb6dd77000f1ad6740494269f55a0ff21df5bcf2
---





More information about the ffmpeg-cvslog mailing list