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 /cmdutils.c | |
| 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 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 38c8159e73..cfbe93320a 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1851,7 +1851,7 @@ static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbu /* XXX this shouldn't be needed, but some tests break without this line * those decoders are buggy and need to be fixed. * the following tests fail: - * cdgraphics, ansi, aasc, fraps-v1, qtrle-1bit + * cdgraphics, ansi, aasc, qtrle-1bit */ memset(buf->base[0], 128, ret); |