videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec: Change get_pixels() to ptrdiff_t linesize 

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-06 15:43:38 +02:00
parent 6b1df5544e
commit 305f72aee7
10 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/alpha/pixblockdsp_alpha.c
View File

@ -23,7 +23,7 @@
#include "asm.h"
static void get_pixels_mvi(int16_t *restrict block,
const uint8_t *restrict pixels, int line_size)
const uint8_t *restrict pixels, ptrdiff_t line_size)
{
int h = 8;

2
libavcodec/arm/pixblockdsp_init_arm.c
View File

@ -24,7 +24,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/pixblockdsp.h"
void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride);
void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, ptrdiff_t stride);
void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1,
const uint8_t *s2, int stride);

2
libavcodec/avdct.h
View File

@ -64,7 +64,7 @@ typedef struct AVDCT {
void (*get_pixels)(int16_t *block /* align 16 */,
const uint8_t *pixels /* align 8 */,
int line_size);
ptrdiff_t line_size);
} AVDCT;
/**

2
libavcodec/dv.h
View File

@ -45,7 +45,7 @@ typedef struct DVVideoContext {
uint8_t dv_zigzag[2][64];
void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size);
void (*get_pixels)(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void (*fdct[2])(int16_t *block);
void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
me_cmp_func ildct_cmp;

2
libavcodec/pixblockdsp.h
View File

@ -26,7 +26,7 @@
typedef struct PixblockDSPContext {
void (*get_pixels)(int16_t *block /* align 16 */,
const uint8_t *pixels /* align 8 */,
int line_size);
ptrdiff_t line_size);
void (*diff_pixels)(int16_t *block /* align 16 */,
const uint8_t *s1 /* align 8 */,
const uint8_t *s2 /* align 8 */,

2
libavcodec/pixblockdsp_template.c
View File

@ -19,7 +19,7 @@
#include "bit_depth_template.c"
static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels,
int line_size)
ptrdiff_t line_size)
{
const pixel *pixels = (const pixel *) _pixels;
int i;

2
libavcodec/ppc/pixblockdsp.c
View File

@ -36,7 +36,7 @@
#if HAVE_ALTIVEC
static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
int line_size)
ptrdiff_t line_size)
{
int i;
vector unsigned char perm = vec_lvsl(0, pixels);

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 72
#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \

4
libavcodec/x86/pixblockdsp.asm
View File

@ -26,9 +26,8 @@
SECTION .text
INIT_MMX mmx
; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size)
; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size)
cglobal get_pixels, 3,4
movsxdifnidn r2, r2d
add r0, 128
mov r3, -128
pxor m7, m7
@ -52,7 +51,6 @@ cglobal get_pixels, 3,4
INIT_XMM sse2
cglobal get_pixels, 3, 4, 5
movsxdifnidn r2, r2d
lea r3, [r2*3]
pxor m4, m4
movh m0, [r1]

4
libavcodec/x86/pixblockdsp_init.c
View File

@ -23,8 +23,8 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/pixblockdsp.h"
void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size);
void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size);
void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2,
int stride);
void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2,