Browse Source

x86: h264qpel: int --> ptrdiff_t for some line_size parameters

tags/n2.0
Diego Biurrun 12 years ago
parent
commit
a89c05500f
2 changed files with 9 additions and 6 deletions
  1. +8
    -5
      libavcodec/x86/h264_qpel.c
  2. +1
    -1
      libavcodec/x86/qpel.asm

+ 8
- 5
libavcodec/x86/h264_qpel.c View File

@@ -28,17 +28,20 @@
#include "dsputil_mmx.h"

#if HAVE_YASM
void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h);
void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
static void ff_put_pixels16_mmxext(uint8_t *block, const uint8_t *pixels,
int line_size, int h)
ptrdiff_t line_size, int h)
{
ff_put_pixels8_mmxext(block, pixels, line_size, h);
ff_put_pixels8_mmxext(block + 8, pixels + 8, line_size, h);
}
static void ff_avg_pixels16_mmxext(uint8_t *block, const uint8_t *pixels,
int line_size, int h)
ptrdiff_t line_size, int h)
{
ff_avg_pixels8_mmxext(block, pixels, line_size, h);
ff_avg_pixels8_mmxext(block + 8, pixels + 8, line_size, h);


+ 1
- 1
libavcodec/x86/qpel.asm View File

@@ -176,7 +176,7 @@ PIXELS16_L2 put
PIXELS16_L2 avg

INIT_MMX mmxext
; void pixels(uint8_t *block, const uint8_t *pixels, int line_size, int h)
; void pixels(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
%macro PIXELS48 2
%if %2 == 4
%define OP movh


Loading…
Cancel
Save