fraps: fix off-by one bug for version 1.

CC:libav-stable@libav.org

diff --git a/cmdutils.c b/cmdutils.c
index dbe22e3ea4c4aa7b6e6e1b26c5a8007584326f70..a9523aec7420120335ac7fb6ffa82bfa1a194c74 100644 (file)
--- 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:
-     * fraps-v1, qtrle-1bit
+     * qtrle-1bit
      */
     memset(buf->base[0], 128, ret);
 

diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 5473bd8b76e355eecb087845871ae16421e886a8..237cb743f9255e56004069995eaae15a2a11f20a 100644 (file)
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -239,7 +239,7 @@ static int decode_frame(AVCodecContext *avctx,
 
         if (f->pict_type == AV_PICTURE_TYPE_I) {
             for (y = 0; y<avctx->height; y++)
-                memcpy(&f->data[0][(avctx->height - y) * f->linesize[0]],
+                memcpy(&f->data[0][(avctx->height - y - 1) * f->linesize[0]],
                        &buf[y * avctx->width * 3],
                        3 * avctx->width);
         }

diff --git a/tests/ref/fate/fraps-v1 b/tests/ref/fate/fraps-v1
index 64392c33b46151dc0a3ac2edc1a706438d4434a5..29c7e37df38c206292d82ffc1b296cb114353f93 100644 (file)
--- a/tests/ref/fate/fraps-v1
+++ b/tests/ref/fate/fraps-v1
@@ -1,2 +1,2 @@
 #tb 0: 1/25
-0,          0,          0,        1,   230400, 0x6bc891ff
+0,          0,          0,        1,   230400, 0x23c29d17