diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:56:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:57:45 +0100 |
| commit | 769eba75eeaa6ee013d7d0573764531e674b6d9b (patch) | |
| tree | 4f05b00113df786611c178c9bfa535bbc36ed819 /cmdutils.c | |
| parent | 68c0144d028bb65ea93651503b154a056246b03d (diff) | |
| parent | 89f11f498b9c15bc71494a11a7ec560f4adf630d (diff) | |
Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'
* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d':
qtrle: fix the topmost line for 1bit
Conflicts:
tests/ref/fate/qtrle-1bit
See: 1af91978dbab35ba9fdede187577c00d643ae33b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 29a23d7e4f..bd6ad449f7 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1856,7 +1856,6 @@ 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: - * qtrle-1bit */ memset(buf->base[0], 128, ret); |