diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:41:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:41:51 +0200 |
| commit | 0a83007ceee404f9bfdcfc3feb780ace58738eaf (patch) | |
| tree | f5e895f760594436a308e86abb50a7c8a69785b9 | |
| parent | 330791c2ae2b7a10147add181373c11984c7284b (diff) | |
| parent | 7585a6254bbb38148e4467793fc34211b79d5f7d (diff) | |
| download | ffmpeg-0a83007ceee404f9bfdcfc3feb780ace58738eaf.tar.gz | |
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@gmx.at>
0 files changed, 0 insertions, 0 deletions