[FFmpeg-cvslog] Merge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10
Michael Niedermayer
git at videolan.org
Sat Aug 9 19:49:33 CEST 2014
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 9 19:41:27 2014 +0200| [0a83007ceee404f9bfdcfc3feb780ace58738eaf] | committer: Michael Niedermayer
Merge commit '7585a6254bbb38148e4467793fc34211b79d5f7d' into release/0.10
* commit '7585a6254bbb38148e4467793fc34211b79d5f7d':
h264: prevent theoretical infinite loop in SEI parsing
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a83007ceee404f9bfdcfc3feb780ace58738eaf
---
More information about the ffmpeg-cvslog
mailing list