[FFmpeg-cvslog] Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'
Michael Niedermayer
git at videolan.org
Sun Oct 13 08:58:41 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 08:43:50 2013 +0200| [3ce0eddeab39bf04748c1153ae096e81facd0a6d] | committer: Michael Niedermayer
Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'
* commit 'ed9245dba83f9add60f55718b537b0af2105c60e':
oggparsevorbis: check allocations
Conflicts:
libavformat/oggparsevorbis.c
See: 033f1644b59abd755bb529afa5db394d18d9c30b
See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ce0eddeab39bf04748c1153ae096e81facd0a6d
---
More information about the ffmpeg-cvslog
mailing list