ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Feb 17
22:08:46 2015 +0100| [880cee004418b7067605cbd9e720aabb0a617164] | committer:
Michael Niedermayer
Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'
* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
nutdec: Check memory allocations
Conflicts:
libavformat/nutdec.c
See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=880cee004418b7067605cbd9e720aabb0a617164
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
