[FFmpeg-cvslog] Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
Michael Niedermayer
git at videolan.org
Mon Jul 27 20:51:22 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 27 20:42:09 2015 +0200| [59b009411fcc8531d661a381bbd2608e36c20bd0] | committer: Michael Niedermayer
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
wmv2enc: Check memory allocation
Conflicts:
libavcodec/wmv2enc.c
See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59b009411fcc8531d661a381bbd2608e36c20bd0
---
More information about the ffmpeg-cvslog
mailing list