ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to