diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:33:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:33:21 +0200 |
| commit | ae7ea2eabf35a28be592b45719e7bd4f7ca4b622 (patch) | |
| tree | 9a346075a4afe61ac97eb083415d86eb03813641 | |
| parent | 0bcf514198bfcb5ae99744bd82842ae37a5a55ad (diff) | |
| parent | 512354191328c559fcff56070dab897ee2a1b4c1 (diff) | |
| download | ffmpeg-ae7ea2eabf35a28be592b45719e7bd4f7ca4b622.tar.gz | |
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 <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions