ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Fri Aug
8 14:33:02 2014 +0200| [ae7ea2eabf35a28be592b45719e7bd4f7ca4b622] | committer:
Michael Niedermayer
Merge commit '512354191328c559fcff56070dab897ee2a1b4c1' into release/1.1
* commit '512354191328c559fcff56070dab897ee2a1b4c1':
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=ae7ea2eabf35a28be592b45719e7bd4f7ca4b622
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
