diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 14:10:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 14:10:13 +0200 |
| commit | 8447658550006996d30e232b1d77614c92a4cc5e (patch) | |
| tree | 049e2d57d62f1946b625f9c21035af5d7c664033 /libavcodec/hevcpred.h | |
| parent | 93318983c3e565b3079362ec69cf3362febc5004 (diff) | |
| parent | a1c2b48018b09d2613f075ec0748c95bd520ac00 (diff) | |
| download | ffmpeg-8447658550006996d30e232b1d77614c92a4cc5e.tar.gz | |
Merge commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00'
* commit 'a1c2b48018b09d2613f075ec0748c95bd520ac00':
hevc: templatize intra_pred
Conflicts:
libavcodec/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcpred.h')
| -rw-r--r-- | libavcodec/hevcpred.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/hevcpred.h b/libavcodec/hevcpred.h index 4dead2ecdc..7f14a76da1 100644 --- a/libavcodec/hevcpred.h +++ b/libavcodec/hevcpred.h @@ -29,13 +29,15 @@ struct HEVCContext; typedef struct HEVCPredContext { - void (*intra_pred)(struct HEVCContext *s, int x0, int y0, int log2_size, int c_idx); + void (*intra_pred[4])(struct HEVCContext *s, int x0, int y0, int c_idx); - void(*pred_planar[4])(uint8_t *src, const uint8_t *top, const uint8_t *left, ptrdiff_t stride); - void(*pred_dc)(uint8_t *src, const uint8_t *top, const uint8_t *left, ptrdiff_t stride, - int log2_size, int c_idx); - void(*pred_angular[4])(uint8_t *src, const uint8_t *top, const uint8_t *left, ptrdiff_t stride, - int c_idx, int mode); + void (*pred_planar[4])(uint8_t *src, const uint8_t *top, + const uint8_t *left, ptrdiff_t stride); + void (*pred_dc)(uint8_t *src, const uint8_t *top, const uint8_t *left, + ptrdiff_t stride, int log2_size, int c_idx); + void (*pred_angular[4])(uint8_t *src, const uint8_t *top, + const uint8_t *left, ptrdiff_t stride, + int c_idx, int mode); } HEVCPredContext; void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth); |