diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 12:18:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 12:18:25 +0100 |
| commit | ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19 (patch) | |
| tree | c288d3a3a358016a16aefbe702b454a9777cf98f /libavcodec/dsputil.h | |
| parent | 127ff88639e78b9d16fecb973c41b86a843b4fa7 (diff) | |
| parent | 25841dfe806a13de526ae09c11149ab1f83555a8 (diff) | |
| download | ffmpeg-ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19.tar.gz | |
Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index b1eba49915..4fea90f666 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -144,7 +144,7 @@ void clear_blocks_c(int16_t *blocks); /* add and put pixel (decoding) */ // blocksizes for op_pixels_func are 8x4,8x8 16x8 16x16 //h for op_pixels_func is limited to {width/2, width} but never larger than 16 and never smaller than 4 -typedef void (*op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int h); +typedef void (*op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, ptrdiff_t line_size, int h); typedef void (*tpel_mc_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int w, int h); typedef void (*qpel_mc_func)(uint8_t *dst/*align width (8 or 16)*/, uint8_t *src/*align 1*/, int stride); typedef void (*h264_chroma_mc_func)(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int srcStride, int h, int x, int y); |