summaryrefslogtreecommitdiff
path: root/libavcodec/hevcpred_template.c
diff options
context:
space:
mode:
authorMickaƫl Raulet <mraulet@insa-rennes.fr>2014-05-13 08:13:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-13 14:29:50 +0200
commitbb9e5116fe5b6873d67854bf08ee5d71949764b2 (patch)
tree78d66626331285df3f2547e851d7c30b444d6100 /libavcodec/hevcpred_template.c
parent38df49a068c84e5e01a8f2932e762198828beeb9 (diff)
hevc: fixing code indenting in hevcpred(cherry picked from commit 28a5916845928de2951013b5398465573b181925)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcpred_template.c')
-rw-r--r--libavcodec/hevcpred_template.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c
index ad1f3b53f4..5ed7647f92 100644
--- a/libavcodec/hevcpred_template.c
+++ b/libavcodec/hevcpred_template.c
@@ -363,7 +363,8 @@ static void FUNC(intra_pred)(HEVCContext *s, int x0, int y0, int log2_size, int
}
static av_always_inline void FUNC(pred_planar)(uint8_t *_src, const uint8_t *_top,
- const uint8_t *_left, ptrdiff_t stride, int trafo_size)
+ const uint8_t *_left, ptrdiff_t stride,
+ int trafo_size)
{
int x, y;
pixel *src = (pixel *)_src;
@@ -472,14 +473,14 @@ static av_always_inline void FUNC(pred_angular)(uint8_t *_src,
int fact = ((y + 1) * angle) & 31;
if (fact) {
for (x = 0; x < size; x += 4) {
- POS(x, y) = ((32 - fact) * ref[x + idx + 1] +
- fact * ref[x + idx + 2] + 16) >> 5;
+ POS(x , y) = ((32 - fact) * ref[x + idx + 1] +
+ fact * ref[x + idx + 2] + 16) >> 5;
POS(x + 1, y) = ((32 - fact) * ref[x + 1 + idx + 1] +
- fact * ref[x + 1 + idx + 2] + 16) >> 5;
+ fact * ref[x + 1 + idx + 2] + 16) >> 5;
POS(x + 2, y) = ((32 - fact) * ref[x + 2 + idx + 1] +
- fact * ref[x + 2 + idx + 2] + 16) >> 5;
+ fact * ref[x + 2 + idx + 2] + 16) >> 5;
POS(x + 3, y) = ((32 - fact) * ref[x + 3 + idx + 1] +
- fact * ref[x + 3 + idx + 2] + 16) >> 5;
+ fact * ref[x + 3 + idx + 2] + 16) >> 5;
}
} else {
for (x = 0; x < size; x += 4)
@@ -515,10 +516,10 @@ static av_always_inline void FUNC(pred_angular)(uint8_t *_src,
}
if (mode == 10 && c_idx == 0 && size < 32) {
for (x = 0; x < size; x += 4) {
- POS(x, 0) = av_clip_pixel(left[0] + ((top[x] - top[-1]) >> 1));
- POS(x+1, 0) = av_clip_pixel(left[0] + ((top[x+1] - top[-1]) >> 1));
- POS(x+2, 0) = av_clip_pixel(left[0] + ((top[x+2] - top[-1]) >> 1));
- POS(x+3, 0) = av_clip_pixel(left[0] + ((top[x+3] - top[-1]) >> 1));
+ POS(x, 0) = av_clip_pixel(left[0] + ((top[x ] - top[-1]) >> 1));
+ POS(x + 1, 0) = av_clip_pixel(left[0] + ((top[x + 1] - top[-1]) >> 1));
+ POS(x + 2, 0) = av_clip_pixel(left[0] + ((top[x + 2] - top[-1]) >> 1));
+ POS(x + 3, 0) = av_clip_pixel(left[0] + ((top[x + 3] - top[-1]) >> 1));
}
}
}