ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Tue Aug
5 03:55:01 2014 +0200| [188ce941ec01c3292609055d338ec51525e07b34] | committer:
Michael Niedermayer
Merge commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b' into release/2.2
* commit '2273e5ed992661e0c4b37208e792e2253d5a0b5b':
h264: prevent theoretical infinite loop in SEI parsing
Conflicts:
libavcodec/h264_sei.c
See: 9decfc17bb76da34734296048d390b176abf404c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=188ce941ec01c3292609055d338ec51525e07b34
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
