[FFmpeg-cvslog] Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'
Michael Niedermayer
git at videolan.org
Thu Jun 13 13:47:56 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 13:41:27 2013 +0200| [dbddd587e13b9bf718ee0eb0d183be6d8ffb996f] | committer: Michael Niedermayer
Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'
* commit 'de2e5777e225e75813daf2373c95e223651fd89a':
4xm: validate the buffer size before parsing it
Conflicts:
libavcodec/4xm.c
See: 9c661e95
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbddd587e13b9bf718ee0eb0d183be6d8ffb996f
---
More information about the ffmpeg-cvslog
mailing list