diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 12:57:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 12:57:14 +0100 |
| commit | 81bcf9454e19702d43e0d314047acbe97226ed89 (patch) | |
| tree | 92f11a319378bd9157356377ede1b02cac0b3001 /tests | |
| parent | 5a3c8f95d5bfbab31ce4b460d41b193c4a2cfbb5 (diff) | |
| parent | 108ca6fad1e0e9af8d6337f908bfd23807b7fbd6 (diff) | |
| download | ffmpeg-81bcf9454e19702d43e0d314047acbe97226ed89.tar.gz | |
Merge commit '108ca6fad1e0e9af8d6337f908bfd23807b7fbd6' into release/1.1
* commit '108ca6fad1e0e9af8d6337f908bfd23807b7fbd6':
yop: check for input overreads.
yop: check that extradata is large enough.
fraps: fix off-by one bug for version 1.
Conflicts:
libavcodec/fraps.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/fate/fraps-v1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/fate/fraps-v1 b/tests/ref/fate/fraps-v1 index 64392c33b4..29c7e37df3 100644 --- a/tests/ref/fate/fraps-v1 +++ b/tests/ref/fate/fraps-v1 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 230400, 0x6bc891ff +0, 0, 0, 1, 230400, 0x23c29d17 |