ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 1
02:10:30 2015 +0200| [fb7b5dc0e6146e21e67a1de0c32567e69edb33a6] | committer:
Michael Niedermayer
Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'
* commit '41658bc88553dab8499e4dfca311559dcbae2674':
libtheora: Check memory allocation
Conflicts:
libavcodec/libtheoraenc.c
See: 67d4d5f5db060fece8cc8e925f18f0a1c48813c6
See: 27216bf314c62125c408be1a5a79e5c9dba88e76
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb7b5dc0e6146e21e67a1de0c32567e69edb33a6
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
