diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-01-29 12:42:54 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-02-07 07:18:56 +0100 |
| commit | 1f8bf163e4b430d1a6e14d8867f3d47f50d5425e (patch) | |
| tree | 9491f1c318176280ce93135f734b869988618f6b | |
| parent | 108ca6fad1e0e9af8d6337f908bfd23807b7fbd6 (diff) | |
| download | ffmpeg-1f8bf163e4b430d1a6e14d8867f3d47f50d5425e.tar.gz | |
aasc: fix output for msrle compression.
The bottom line was invalid before.
CC:libav-stable@libav.org
(cherry picked from commit da7baaaae79b4d7d715d35ea6bcfbdd149edc177)
Conflicts:
cmdutils.c
| -rw-r--r-- | cmdutils.c | 2 | ||||
| -rw-r--r-- | libavcodec/aasc.c | 2 | ||||
| -rw-r--r-- | tests/ref/fate/aasc | 46 |
3 files changed, 25 insertions, 25 deletions
diff --git a/cmdutils.c b/cmdutils.c index 45418afd91..cc165bd597 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1566,7 +1566,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, qtrle-1bit + * cdgraphics, ansi, qtrle-1bit */ memset(buf->base[0], 128, ret); diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 47d25d0d09..7063cbeec8 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -77,7 +77,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, } break; case 1: - bytestream2_init(&s->gb, buf - 4, buf_size + 4); + bytestream2_init(&s->gb, buf, buf_size); ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, &s->gb); break; default: diff --git a/tests/ref/fate/aasc b/tests/ref/fate/aasc index b991635715..57d59a9c48 100644 --- a/tests/ref/fate/aasc +++ b/tests/ref/fate/aasc @@ -1,24 +1,24 @@ #tb 0: 1/25 -0, 0, 0, 1, 168000, 0x45addf8f -0, 1, 1, 1, 168000, 0x45addf8f -0, 2, 2, 1, 168000, 0x45addf8f -0, 3, 3, 1, 168000, 0x45addf8f -0, 4, 4, 1, 168000, 0x45addf8f -0, 5, 5, 1, 168000, 0x45addf8f -0, 6, 6, 1, 168000, 0x45addf8f -0, 7, 7, 1, 168000, 0x45addf8f -0, 8, 8, 1, 168000, 0x45addf8f -0, 9, 9, 1, 168000, 0x45addf8f -0, 10, 10, 1, 168000, 0x45addf8f -0, 11, 11, 1, 168000, 0x45addf8f -0, 12, 12, 1, 168000, 0x8730699b -0, 13, 13, 1, 168000, 0x08b095df -0, 14, 14, 1, 168000, 0x203526e3 -0, 15, 15, 1, 168000, 0x0ebc5142 -0, 16, 16, 1, 168000, 0xd168e7c2 -0, 17, 17, 1, 168000, 0xcc7da0e6 -0, 18, 18, 1, 168000, 0x72ac60b8 -0, 19, 19, 1, 168000, 0xb691e27c -0, 20, 20, 1, 168000, 0x646fa087 -0, 21, 21, 1, 168000, 0x404450a2 -0, 22, 22, 1, 168000, 0x5214c456 +0, 0, 0, 1, 168000, 0x00000000 +0, 1, 1, 1, 168000, 0x00000000 +0, 2, 2, 1, 168000, 0x00000000 +0, 3, 3, 1, 168000, 0x00000000 +0, 4, 4, 1, 168000, 0x00000000 +0, 5, 5, 1, 168000, 0x00000000 +0, 6, 6, 1, 168000, 0x00000000 +0, 7, 7, 1, 168000, 0x00000000 +0, 8, 8, 1, 168000, 0x00000000 +0, 9, 9, 1, 168000, 0x00000000 +0, 10, 10, 1, 168000, 0x00000000 +0, 11, 11, 1, 168000, 0x00000000 +0, 12, 12, 1, 168000, 0xa6298d46 +0, 13, 13, 1, 168000, 0x5d89d96c +0, 14, 14, 1, 168000, 0x16d994da +0, 15, 15, 1, 168000, 0xa8c6079b +0, 16, 16, 1, 168000, 0xdd1decac +0, 17, 17, 1, 168000, 0x6a96003c +0, 18, 18, 1, 168000, 0xef7f1ff4 +0, 19, 19, 1, 168000, 0x90dc0126 +0, 20, 20, 1, 168000, 0x7a2b1006 +0, 21, 21, 1, 168000, 0xc7ca1345 +0, 22, 22, 1, 168000, 0x8841c413 |