diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:21:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:21:39 +0100 |
| commit | a845ac78c9428d6fd0f9f4f61a34ac816e3dedfa (patch) | |
| tree | 071d4b4757b5b9abcfe05857f7e9c50aee88b43a /libavcodec/fraps.c | |
| parent | ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333 (diff) | |
| parent | 2cd4068071b9a8908823a3107f97e938211045ce (diff) | |
| download | ffmpeg-a845ac78c9428d6fd0f9f4f61a34ac816e3dedfa.tar.gz | |
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>
Diffstat (limited to 'libavcodec/fraps.c')
| -rw-r--r-- | libavcodec/fraps.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index cc2f52b609..5e2ba90d3f 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -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: |