[FFmpeg-cvslog] Merge commit 'a55a70644872027fdf76a75edf12a09c9008880f' into release/2.4
Michael Niedermayer
git at videolan.org
Tue May 19 21:36:42 CEST 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 21:24:39 2015 +0200| [9005075f397bc7bd2fa2e193f62cbf971bdaa4d4] | committer: Michael Niedermayer
Merge commit 'a55a70644872027fdf76a75edf12a09c9008880f' into release/2.4
* commit 'a55a70644872027fdf76a75edf12a09c9008880f':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac49a0dc073ac1f10977979acdb94f97
See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9005075f397bc7bd2fa2e193f62cbf971bdaa4d4
---
More information about the ffmpeg-cvslog
mailing list