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.c | |
| 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.c')
| -rw-r--r-- | libavcodec/hevcpred.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/hevcpred.c b/libavcodec/hevcpred.c index e4987f8eca..4dfbfbfed0 100644 --- a/libavcodec/hevcpred.c +++ b/libavcodec/hevcpred.c @@ -42,7 +42,10 @@ void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth) #define FUNC(a, depth) a ## _ ## depth #define HEVC_PRED(depth) \ - hpc->intra_pred = FUNC(intra_pred, depth); \ + hpc->intra_pred[0] = FUNC(intra_pred_2, depth); \ + hpc->intra_pred[1] = FUNC(intra_pred_3, depth); \ + hpc->intra_pred[2] = FUNC(intra_pred_4, depth); \ + hpc->intra_pred[3] = FUNC(intra_pred_5, depth); \ hpc->pred_planar[0] = FUNC(pred_planar_0, depth); \ hpc->pred_planar[1] = FUNC(pred_planar_1, depth); \ hpc->pred_planar[2] = FUNC(pred_planar_2, depth); \ |