aasc: use the correct reader offset

Fixes Ticket1232

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index c2758229b348fedbea5a215e65d7b6f90c8560fe..a1363605722074e9a6aa40f19cf366250cf88251 100644 (file)
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -82,7 +82,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 80d5bf27d006dc299a04ff524ce0dee9d5137734..83f83b984b469c786541cd0b7a5d83f2d9112a79 100644 (file)
--- a/tests/ref/fate/aasc
+++ b/tests/ref/fate/aasc
@@ -1,25 +1,25 @@
 #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,         23,         23,        1,   168000, 0xaef602d3
+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
+0,         23,         23,        1,   168000, 0xbaed0290