ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 18
03:08:20 2014 +0100| [8426edef4cf521104bb9288ac46a48dc4bdaee53] | committer:
Michael Niedermayer
Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'
* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
libvpxenc: clean memory on error
Conflicts:
libavcodec/libvpxenc.c
See: 104b1d9e103f90485e894b20dd5bb3f1964fe5f3
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8426edef4cf521104bb9288ac46a48dc4bdaee53
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
