diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 11:59:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 17:28:44 +0100 |
| commit | 35594c48caf00ef96c45b50be4767f3e7f08a77f (patch) | |
| tree | 0aa444b2506a14878bb932b63e15507534881afd /libavcodec/hevcpred_template.c | |
| parent | 2c4f5736962a7ae6a484017eddc07452cc4c39c0 (diff) | |
| download | ffmpeg-35594c48caf00ef96c45b50be4767f3e7f08a77f.tar.gz | |
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcpred_template.c')
| -rw-r--r-- | libavcodec/hevcpred_template.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c index 81fa97e2dd..5ba95919b1 100644 --- a/libavcodec/hevcpred_template.c +++ b/libavcodec/hevcpred_template.c @@ -1,5 +1,5 @@ /* - * HEVC video Decoder + * HEVC video decoder * * Copyright (C) 2012 - 2013 Guillaume Martres * @@ -292,20 +292,6 @@ static void FUNC(intra_pred)(HEVCContext *s, int x0, int y0, int log2_size, int top[-1] = left[-1]; -#undef EXTEND_LEFT_CIP -#undef EXTEND_RIGHT_CIP -#undef EXTEND_UP_CIP -#undef EXTEND_DOWN_CIP -#undef IS_INTRA -#undef MVF_PU -#undef MVF -#undef PU -#undef EXTEND_LEFT -#undef EXTEND_RIGHT -#undef EXTEND_UP -#undef EXTEND_DOWN -#undef MIN_TB_ADDR_ZS - // Filtering process if (c_idx == 0 && mode != INTRA_DC && size != 4) { int intra_hor_ver_dist_thresh[] = { 7, 1, 0 }; @@ -557,4 +543,17 @@ static void FUNC(pred_angular_3)(uint8_t *src, const uint8_t *top, FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 5); } +#undef EXTEND_LEFT_CIP +#undef EXTEND_RIGHT_CIP +#undef EXTEND_UP_CIP +#undef EXTEND_DOWN_CIP +#undef IS_INTRA +#undef MVF_PU +#undef MVF +#undef PU +#undef EXTEND_LEFT +#undef EXTEND_RIGHT +#undef EXTEND_UP +#undef EXTEND_DOWN +#undef MIN_TB_ADDR_ZS #undef POS |