generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
CC:libav-stable@libav.org
(cherry picked from commit 2cd4068071)

Conflicts:

	cmdutils.c
	libavcodec/fraps.c
This commit is contained in:
Anton Khirnov
2013-01-29 17:19:08 +01:00
committed by Reinhard Tartler
parent 5bee21d724
commit 00bf66785f
3 changed files with 3 additions and 3 deletions
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:
* cdgraphics, ansi, aasc, fraps-v1, qtrle-1bit * cdgraphics, ansi, aasc, qtrle-1bit
*/ */
memset(buf->base[0], 128, ret); memset(buf->base[0], 128, ret);

2
libavcodec/fraps.c
View File

@@ -235,7 +235,7 @@ static int decode_frame(AVCodecContext *avctx,
if (f->pict_type == AV_PICTURE_TYPE_I) { if (f->pict_type == AV_PICTURE_TYPE_I) {
for(y=0; y<avctx->height; y++) 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], &buf[y*avctx->width*3],
3*avctx->width); 3*avctx->width);
} }

2
tests/ref/fate/fraps-v1
View File

@@ -1,2 +1,2 @@
#tb 0: 1/25 #tb 0: 1/25
0, 0, 0, 1, 230400, 0x6bc891ff 0, 0, 0, 1, 230400, 0x23c29d17