mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'
* 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:
commit
a845ac78c9
|
@ -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
|
/* 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:
|
||||||
* fraps-v1, qtrle-1bit
|
* qtrle-1bit
|
||||||
*/
|
*/
|
||||||
memset(buf->base[0], 128, ret);
|
memset(buf->base[0], 128, ret);
|
||||||
|
|
||||||
|
|
|
@ -248,11 +248,9 @@ static int decode_frame(AVCodecContext *avctx,
|
||||||
case 1:
|
case 1:
|
||||||
/* Fraps v1 is an upside-down BGR24 */
|
/* Fraps v1 is an upside-down BGR24 */
|
||||||
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);
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
#tb 0: 1/25
|
#tb 0: 1/25
|
||||||
0, 0, 0, 1, 230400, 0x6bc891ff
|
0, 0, 0, 1, 230400, 0x23c29d17
|
||||||
|
|
Loading…
Reference in New Issue