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

Merge commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c'

Browse Source 
* commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c':
  blockdsp: Change type of array stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-21 15:19:17 +01:00
commit 6d11b2f656
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/blockdsp.c
View File

@ -35,7 +35,8 @@ static void clear_blocks_c(int16_t *blocks)
memset(blocks, 0, sizeof(int16_t) * 6 * 64);
}
static void fill_block16_c(uint8_t *block, uint8_t value, int line_size, int h)
static void fill_block16_c(uint8_t *block, uint8_t value, ptrdiff_t line_size,
int h)
{
int i;
@ -45,7 +46,8 @@ static void fill_block16_c(uint8_t *block, uint8_t value, int line_size, int h)
}
}
static void fill_block8_c(uint8_t *block, uint8_t value, int line_size, int h)
static void fill_block8_c(uint8_t *block, uint8_t value, ptrdiff_t line_size,
int h)
{
int i;

3
libavcodec/blockdsp.h
View File

@ -19,6 +19,7 @@
#ifndef AVCODEC_BLOCKDSP_H
#define AVCODEC_BLOCKDSP_H
#include <stddef.h>
#include <stdint.h>
#include "avcodec.h"
@ -29,7 +30,7 @@
* h for op_pixels_func is limited to { width / 2, width },
* but never larger than 16 and never smaller than 4. */
typedef void (*op_fill_func)(uint8_t *block /* align width (8 or 16) */,
uint8_t value, int line_size, int h);
uint8_t value, ptrdiff_t line_size, int h);
typedef struct BlockDSPContext {
void (*clear_block)(int16_t *block /* align 16 */);

8
libavcodec/mips/blockdsp_mips.h
View File

@ -24,13 +24,13 @@
#include "../mpegvideo.h"
void ff_fill_block16_msa(uint8_t *src, uint8_t val, int stride, int height);
void ff_fill_block8_msa(uint8_t *src, uint8_t val, int stride, int height);
void ff_fill_block16_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height);
void ff_fill_block8_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height);
void ff_clear_block_msa(int16_t *block);
void ff_clear_blocks_msa(int16_t *block);
void ff_fill_block16_mmi(uint8_t *block, uint8_t value, int line_size, int h);
void ff_fill_block8_mmi(uint8_t *block, uint8_t value, int line_size, int h);
void ff_fill_block16_mmi(uint8_t *block, uint8_t value, ptrdiff_t line_size, int h);
void ff_fill_block8_mmi(uint8_t *block, uint8_t value, ptrdiff_t line_size, int h);
void ff_clear_block_mmi(int16_t *block);
void ff_clear_blocks_mmi(int16_t *block);

4
libavcodec/mips/blockdsp_mmi.c
View File

@ -24,7 +24,7 @@
#include "blockdsp_mips.h"
#include "libavutil/mips/mmiutils.h"
void ff_fill_block16_mmi(uint8_t *block, uint8_t value, int line_size, int h)
void ff_fill_block16_mmi(uint8_t *block, uint8_t value, ptrdiff_t line_size, int h)
{
double ftmp[1];
DECLARE_VAR_ALL64;
@ -48,7 +48,7 @@ void ff_fill_block16_mmi(uint8_t *block, uint8_t value, int line_size, int h)
);
}
void ff_fill_block8_mmi(uint8_t *block, uint8_t value, int line_size, int h)
void ff_fill_block8_mmi(uint8_t *block, uint8_t value, ptrdiff_t line_size, int h)
{
double ftmp0;
DECLARE_VAR_ALL64;

4
libavcodec/mips/blockdsp_msa.c
View File

@ -65,12 +65,12 @@ static void memset_zero_16width_msa(uint8_t *src, int32_t stride,
}
}
void ff_fill_block16_msa(uint8_t *src, uint8_t val, int stride, int height)
void ff_fill_block16_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height)
{
copy_8bit_value_width16_msa(src, val, stride, height);
}
void ff_fill_block8_msa(uint8_t *src, uint8_t val, int stride, int height)
void ff_fill_block8_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height)
{
copy_8bit_value_width8_msa(src, val, stride, height);
}