[FFmpeg-cvslog] Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
Michael Niedermayer
git at videolan.org
Wed Oct 23 09:54:02 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 23 09:47:41 2013 +0200| [078abccdd6dc3f173e3b420fa66e9b8859827b03] | committer: Michael Niedermayer
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
* commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4':
nut: Fix unchecked allocations
Conflicts:
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c
See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=078abccdd6dc3f173e3b420fa66e9b8859827b03
---
More information about the ffmpeg-cvslog
mailing list