[FFmpeg-cvslog] Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'
Michael Niedermayer
git at videolan.org
Sat Mar 16 15:48:43 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 16 15:12:21 2013 +0100| [e066fb54cb6fbc52cd95640ec0e81222750bb329] | committer: Michael Niedermayer
Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'
* commit 'aa3c77998404cc32233cb76e961ca27db8565459':
lavf: sanity check size in av_get/append_packet().
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e066fb54cb6fbc52cd95640ec0e81222750bb329
---
More information about the ffmpeg-cvslog
mailing list