ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1
02:23:32 2015 +0200| [615e73ab4f8cd85e490c7d141fd710385bfaa8ac] | committer:
Michael Niedermayer
Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'
* commit '03927cb73399e6f07185fc7f8851d7612b4187b6':
psymodel: Check memory allocation
Conflicts:
libavcodec/psymodel.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=615e73ab4f8cd85e490c7d141fd710385bfaa8ac
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
