diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:11:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:16:51 +0100 |
| commit | ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333 (patch) | |
| tree | c5f3853a3433eec3cdd35f93b9753affd8b1eb5e /cmdutils.c | |
| parent | 6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7 (diff) | |
| parent | da7baaaae79b4d7d715d35ea6bcfbdd149edc177 (diff) | |
| download | ffmpeg-ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333.tar.gz | |
Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'
* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177':
aasc: fix output for msrle compression.
msrledec: check bounds before constructing a possibly invalid pointer,
cmdutils: remove ansi from the list of broken codecs.
Conflicts:
tests/ref/fate/aasc
Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5
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 88f73a985d..1357882055 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1856,7 +1856,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: - * ansi, aasc, fraps-v1, qtrle-1bit + * fraps-v1, qtrle-1bit */ memset(buf->base[0], 128, ret); |