[FFmpeg-cvslog] Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'

Michael Niedermayer git at videolan.org
Mon Jul 29 11:50:28 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 11:42:47 2013 +0200| [0c6f382e855749ec45224a74ba5e07d1db52e6a0] | committer: Michael Niedermayer

Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'

* commit '62b1e3b1031e901105d78e831120de8e4c3e0013':
  aasc: Check minimum buffer size

Conflicts:
	libavcodec/aasc.c

See: e1631f8ebe9a8f2a9cca85d60160b9be94eb63f3
See: 8a57ca5c6a1c0ad28afa7ea6f824981e6761cce1
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c6f382e855749ec45224a74ba5e07d1db52e6a0
---





More information about the ffmpeg-cvslog mailing list