diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 03:55:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 03:55:15 +0200 |
| commit | 188ce941ec01c3292609055d338ec51525e07b34 (patch) | |
| tree | dd5d2d2f0d39557e6e4bd27a768f59cd53386880 /libavcodec/dpxenc.c | |
| parent | 7fc9c7c35b1796040d4b8e11c5055cc820f79615 (diff) | |
| parent | 2273e5ed992661e0c4b37208e792e2253d5a0b5b (diff) | |
| download | ffmpeg-188ce941ec01c3292609055d338ec51525e07b34.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dpxenc.c')
0 files changed, 0 insertions, 0 deletions