diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 14:13:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 14:21:34 +0200 |
| commit | 9bb86faca7936f6dba93aa3b11fc24f19c7878a4 (patch) | |
| tree | 2c0eebe5760e9d56064d6a8030da052885af2523 /libavformat/hlsenc.c | |
| parent | c188c10805aa62d0cdeb5b5ecfba5fa4aec9c47d (diff) | |
| parent | 3185a80259ce1f8f8111073dbd14a69a396e03a3 (diff) | |
| download | ffmpeg-9bb86faca7936f6dba93aa3b11fc24f19c7878a4.tar.gz | |
Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'
* commit '3185a80259ce1f8f8111073dbd14a69a396e03a3':
fraps: Make the input buffer size checks more strict
Conflicts:
libavcodec/fraps.c
The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsenc.c')
0 files changed, 0 insertions, 0 deletions