virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

aasc: fix output for msrle compression.

Browse Source 
The bottom line was invalid before.

CC:libav-stable@libav.org
This commit is contained in:
Anton Khirnov 2013-01-29 12:42:54 +01:00
parent 9bd6375d5f
commit da7baaaae7
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.c
View File

@ -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 /* XXX this shouldn't be needed, but some tests break without this line
* those decoders are buggy and need to be fixed. * those decoders are buggy and need to be fixed.
* the following tests fail: * the following tests fail:
* aasc, fraps-v1, qtrle-1bit * fraps-v1, qtrle-1bit
*/ */
memset(buf->base[0], 128, ret); memset(buf->base[0], 128, ret);

2
libavcodec/aasc.c
View File

@ -77,7 +77,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
} }
break; break;
case 1: 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); ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, &s->gb);
break; break;
default: default:

46
tests/ref/fate/aasc
View File

@ -1,24 +1,24 @@
#tb 0: 1/25 #tb 0: 1/25
0, 0, 0, 1, 168000, 0x45addf8f 0, 0, 0, 1, 168000, 0x00000000
0, 1, 1, 1, 168000, 0x45addf8f 0, 1, 1, 1, 168000, 0x00000000
0, 2, 2, 1, 168000, 0x45addf8f 0, 2, 2, 1, 168000, 0x00000000
0, 3, 3, 1, 168000, 0x45addf8f 0, 3, 3, 1, 168000, 0x00000000
0, 4, 4, 1, 168000, 0x45addf8f 0, 4, 4, 1, 168000, 0x00000000
0, 5, 5, 1, 168000, 0x45addf8f 0, 5, 5, 1, 168000, 0x00000000
0, 6, 6, 1, 168000, 0x45addf8f 0, 6, 6, 1, 168000, 0x00000000
0, 7, 7, 1, 168000, 0x45addf8f 0, 7, 7, 1, 168000, 0x00000000
0, 8, 8, 1, 168000, 0x45addf8f 0, 8, 8, 1, 168000, 0x00000000
0, 9, 9, 1, 168000, 0x45addf8f 0, 9, 9, 1, 168000, 0x00000000
0, 10, 10, 1, 168000, 0x45addf8f 0, 10, 10, 1, 168000, 0x00000000
0, 11, 11, 1, 168000, 0x45addf8f 0, 11, 11, 1, 168000, 0x00000000
0, 12, 12, 1, 168000, 0x8730699b 0, 12, 12, 1, 168000, 0xa6298d46
0, 13, 13, 1, 168000, 0x08b095df 0, 13, 13, 1, 168000, 0x5d89d96c
0, 14, 14, 1, 168000, 0x203526e3 0, 14, 14, 1, 168000, 0x16d994da
0, 15, 15, 1, 168000, 0x0ebc5142 0, 15, 15, 1, 168000, 0xa8c6079b
0, 16, 16, 1, 168000, 0xd168e7c2 0, 16, 16, 1, 168000, 0xdd1decac
0, 17, 17, 1, 168000, 0xcc7da0e6 0, 17, 17, 1, 168000, 0x6a96003c
0, 18, 18, 1, 168000, 0x72ac60b8 0, 18, 18, 1, 168000, 0xef7f1ff4
0, 19, 19, 1, 168000, 0xb691e27c 0, 19, 19, 1, 168000, 0x90dc0126
0, 20, 20, 1, 168000, 0x646fa087 0, 20, 20, 1, 168000, 0x7a2b1006
0, 21, 21, 1, 168000, 0x404450a2 0, 21, 21, 1, 168000, 0xc7ca1345
0, 22, 22, 1, 168000, 0x5214c456 0, 22, 22, 1, 168000, 0x8841c413