diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:48:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:49:19 +0200 |
| commit | 6145b1d9c11bb5261e4b5137ef31defacad56eb5 (patch) | |
| tree | 786abad09307ca729be4a42e693abaaa2f47e6bc /libavcodec/tiff.c | |
| parent | 69505a89f1edcda4191d62149d801da6f48a6c27 (diff) | |
| parent | bf2064f046af64c59a416c814474a39b0a457569 (diff) | |
| download | ffmpeg-6145b1d9c11bb5261e4b5137ef31defacad56eb5.tar.gz | |
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
* commit 'bf2064f046af64c59a416c814474a39b0a457569':
tiffdec: rename variables for consistency and fix variable shadowing
Conflicts:
libavcodec/tiff.c
See: 251345a3fe221d60e9b275567085f9475de68092
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index e0629dbad8..53cdcd0e9f 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1097,7 +1097,7 @@ static int decode_frame(AVCodecContext *avctx, for (i = 0; i < s->height; i++) { for (j = 0; j < p->linesize[plane]; j++) dst[j] = (s->avctx->pix_fmt == AV_PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - dst[j]; - dst += p->linesize[plane]; + dst += stride; } } } |