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

Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'

Browse Source 
* commit '2cd4068071b9a8908823a3107f97e938211045ce':
  fraps: fix off-by one bug for version 1.

Conflicts:
	libavcodec/fraps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-06 15:21:39 +01:00
commit a845ac78c9
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.c
View File

@ -1856,7 +1856,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);

10
libavcodec/fraps.c
View File

@ -247,12 +247,10 @@ static int decode_frame(AVCodecContext *avctx,
case 1:
/* Fraps v1 is an upside-down BGR24 */
for (y=0; y<avctx->height; y++)
memcpy(&f->data[0][(avctx->height - y) * f->linesize[0]],
&buf[y * avctx->width * 3],
3 * avctx->width);
for (y = 0; y<avctx->height; y++)
memcpy(&f->data[0][(avctx->height - y - 1) * f->linesize[0]],
&buf[y * avctx->width * 3],
3 * avctx->width);
break;
case 2:

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

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