RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'

Browse Source 
* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
  indeo2: rename stride to pitch for consistency with other Indeo decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-27 01:11:49 +02:00
commit 826726b83f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/indeo2.c
View File

@ -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;
}