diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:41:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:47:36 +0100 |
| commit | a201639a01284003a055f195f4e850a0cf3fc2d5 (patch) | |
| tree | 959d66dc788f6d76941e646bbb49dea93209b231 /libavcodec/h264pred.h | |
| parent | 788afee86e283535f37fdcb649b2f180ad305f75 (diff) | |
| parent | 7658295ba353b8bedb3af904f46cfb1ba0cea86a (diff) | |
| download | ffmpeg-a201639a01284003a055f195f4e850a0cf3fc2d5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixfmt: support more yuva formats
swscale: support gray to 9bit and 10bit formats
configure: rewrite print_config() function using awk
FATE: fix (AD)PCM test dependencies broken in e519990
Use ptrdiff_t instead of int for intra pred "stride" function parameter.
x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.h')
| -rw-r--r-- | libavcodec/h264pred.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h index d68f39bf8c..33f39447df 100644 --- a/libavcodec/h264pred.h +++ b/libavcodec/h264pred.h @@ -90,21 +90,23 @@ * Context for storing H.264 prediction functions */ typedef struct H264PredContext { - void(*pred4x4[9 + 3 + 3])(uint8_t *src, const uint8_t *topright, int stride); //FIXME move to dsp? - void(*pred8x8l[9 + 3])(uint8_t *src, int topleft, int topright, int stride); - void(*pred8x8[4 + 3 + 4])(uint8_t *src, int stride); - void(*pred16x16[4 + 3 + 2])(uint8_t *src, int stride); + void(*pred4x4[9 + 3 + 3])(uint8_t *src, const uint8_t *topright, + ptrdiff_t stride); + void(*pred8x8l[9 + 3])(uint8_t *src, int topleft, int topright, + ptrdiff_t stride); + void(*pred8x8[4 + 3 + 4])(uint8_t *src, ptrdiff_t stride); + void(*pred16x16[4 + 3 + 2])(uint8_t *src, ptrdiff_t stride); void(*pred4x4_add[2])(uint8_t *pix /*align 4*/, - const DCTELEM *block /*align 16*/, int stride); + const DCTELEM *block /*align 16*/, ptrdiff_t stride); void(*pred8x8l_add[2])(uint8_t *pix /*align 8*/, - const DCTELEM *block /*align 16*/, int stride); + const DCTELEM *block /*align 16*/, ptrdiff_t stride); void(*pred8x8_add[3])(uint8_t *pix /*align 8*/, const int *block_offset, - const DCTELEM *block /*align 16*/, int stride); + const DCTELEM *block /*align 16*/, ptrdiff_t stride); void(*pred16x16_add[3])(uint8_t *pix /*align 16*/, const int *block_offset, - const DCTELEM *block /*align 16*/, int stride); + const DCTELEM *block /*align 16*/, ptrdiff_t stride); } H264PredContext; void ff_h264_pred_init(H264PredContext *h, int codec_id, |