diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 01:11:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 01:11:59 +0200 |
| commit | 826726b83fab660e45166bca476c4e91713c62aa (patch) | |
| tree | 4e4ba099aa1b6de1fe23a827bb4225a0357ca540 /libavcodec | |
| parent | ad081e4def36cba8070b1cc883f168df194c3bed (diff) | |
| parent | 422e14f721c22cf9c19a8e7aae051ba9d559f6b6 (diff) | |
| download | ffmpeg-826726b83fab660e45166bca476c4e91713c62aa.tar.gz | |
Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'
* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
indeo2: rename stride to pitch for consistency with other Indeo decoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/indeo2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index aabe348b4f..cccac44bf3 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -49,7 +49,7 @@ static inline int ir2_get_code(GetBitContext *gb) } static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, - int stride, const uint8_t *table) + int pitch, const uint8_t *table) { int i; int j; @@ -74,7 +74,7 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst dst[out++] = table[(c * 2) + 1]; } } - dst += stride; + dst += pitch; for (j = 1; j < height; j++) { out = 0; @@ -85,27 +85,27 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst if (out + c*2 > width) return AVERROR_INVALIDDATA; for (i = 0; i < c * 2; i++) { - dst[out] = dst[out - stride]; + dst[out] = dst[out - pitch]; out++; } } else { /* add two deltas from table */ - t = dst[out - stride] + (table[c * 2] - 128); + t = dst[out - pitch] + (table[c * 2] - 128); t = av_clip_uint8(t); dst[out] = t; out++; - t = dst[out - stride] + (table[(c * 2) + 1] - 128); + t = dst[out - pitch] + (table[(c * 2) + 1] - 128); t = av_clip_uint8(t); dst[out] = t; out++; } } - dst += stride; + dst += pitch; } return 0; } static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst, - int stride, const uint8_t *table) + int pitch, const uint8_t *table) { int j; int out = 0; @@ -133,7 +133,7 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_ out++; } } - dst += stride; + dst += pitch; } return 0; } |