[FFmpeg-cvslog] Merge commit '0654518597e6ee2947e4a81c26f03f9aec7ef656' into release/2.2
Michael Niedermayer
git at videolan.org
Mon Jun 1 13:11:23 CEST 2015
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 1 13:03:52 2015 +0200| [3bedd0d2325b2c36bbbf5604e0e1aaf7b729c372] | committer: Michael Niedermayer
Merge commit '0654518597e6ee2947e4a81c26f03f9aec7ef656' into release/2.2
* commit '0654518597e6ee2947e4a81c26f03f9aec7ef656':
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=3bedd0d2325b2c36bbbf5604e0e1aaf7b729c372
---
More information about the ffmpeg-cvslog
mailing list