[FFmpeg-cvslog] Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'

Michael Niedermayer git at videolan.org
Tue Feb 17 22:00:17 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 21:50:08 2015 +0100| [80c5dc56104d96eae2d3170720bf5aa4f90467e4] | committer: Michael Niedermayer

Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'

* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
  movenc: Check memory allocations

Conflicts:
	libavformat/movenc.c

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

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





More information about the ffmpeg-cvslog mailing list