virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'

Browse Source 
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
  indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()

Conflicts:
	libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-01 09:51:37 +02:00
commit d8b6557c86
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/indeo3.c
View File

@ -258,19 +258,19 @@ static int copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell)
/* copy using 16xH blocks */ /* copy using 16xH blocks */
if (!((cell->xpos << 2) & 15) && w >= 4) { if (!((cell->xpos << 2) & 15) && w >= 4) {
for (; w >= 4; src += 16, dst += 16, w -= 4) for (; w >= 4; src += 16, dst += 16, w -= 4)
ctx->hdsp.put_no_rnd_pixels_tab[0][0](dst, src, plane->pitch, h); ctx->hdsp.put_pixels_tab[0][0](dst, src, plane->pitch, h);
} }
/* copy using 8xH blocks */ /* copy using 8xH blocks */
if (!((cell->xpos << 2) & 7) && w >= 2) { if (!((cell->xpos << 2) & 7) && w >= 2) {
ctx->hdsp.put_no_rnd_pixels_tab[1][0](dst, src, plane->pitch, h); ctx->hdsp.put_pixels_tab[1][0](dst, src, plane->pitch, h);
w -= 2; w -= 2;
src += 8; src += 8;
dst += 8; dst += 8;
} }
if (w >= 1) { if (w >= 1) {
copy_block4(dst, src, plane->pitch, plane->pitch, h); ctx->hdsp.put_pixels_tab[2][0](dst, src, plane->pitch, h);
w--; w--;
src += 4; src += 4;
dst += 4; dst += 4;