[FFmpeg-cvslog] Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f'
Michael Niedermayer
git at videolan.org
Sun Mar 22 04:12:32 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 22 04:00:56 2015 +0100| [cff55cfe17ec396dd88aea20566ec0b8f27f222c] | committer: Michael Niedermayer
Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f'
* commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f':
oggdec: Check memory allocation
Conflicts:
libavformat/oggdec.c
See: 9b8152bf047bbebe4495b993258591687bcdd36d an others
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cff55cfe17ec396dd88aea20566ec0b8f27f222c
---
More information about the ffmpeg-cvslog
mailing list