---
libavcodec/bfin/hpel_pixels_bfin.S | 8 ++---
libavcodec/bfin/hpeldsp_bfin.c | 60 +++++++++++++++++++-------------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/libavcodec/bfin/hpel_pixels_bfin.S
b/libavcodec/bfin/hpel_pixels_bfin.S
index d311fdf..981b4e3 100644
--- a/libavcodec/bfin/hpel_pixels_bfin.S
+++ b/libavcodec/bfin/hpel_pixels_bfin.S
@@ -102,7 +102,7 @@ DEFUN_END(put_pixels16uc)
-DEFUN(put_pixels8uc_nornd,mL1,
+DEFUN(put_pixels8uc_no_rnd,mL1,
(uint8_t *block, const uint8_t *s0, const uint8_t *s1,
int line_size, int h)):
i3=r0; // dest
@@ -125,9 +125,9 @@ pp8$3: DISALGNEXCPT || R2 = [I1++] ||
[I3++M3] = R7;
(r7:6) = [sp++];
RTS;
-DEFUN_END(put_pixels8uc_nornd)
+DEFUN_END(put_pixels8uc_no_rnd)
-DEFUN(put_pixels16uc_nornd,mL1,
+DEFUN(put_pixels16uc_no_rnd,mL1,
(uint8_t *block, const uint8_t *s0, const uint8_t *s1,
int line_size, int h)):
i3=r0; // dest
@@ -159,7 +159,7 @@ pp16$3: DISALGNEXCPT || R2 = [I1++] ||
[I3++M3] = R7;
(r7:6) = [sp++];
RTS;
-DEFUN_END(put_pixels16uc_nornd)
+DEFUN_END(put_pixels16uc_no_rnd)
DEFUN(z_put_pixels16_xy2,mL1,
(uint8_t *block, const uint8_t *s0,
diff --git a/libavcodec/bfin/hpeldsp_bfin.c b/libavcodec/bfin/hpeldsp_bfin.c
index 9bed7f3..263f5be 100644
--- a/libavcodec/bfin/hpeldsp_bfin.c
+++ b/libavcodec/bfin/hpeldsp_bfin.c
@@ -29,12 +29,12 @@
#include "libavcodec/hpeldsp.h"
#include "hpeldsp_bfin.h"
-void ff_bfin_put_pixels8uc_nornd(uint8_t *block, const uint8_t *s0,
- const uint8_t *s1, int line_size,
- int h) attribute_l1_text;
-void ff_bfin_put_pixels16uc_nornd(uint8_t *block, const uint8_t *s0,
+void ff_bfin_put_pixels8uc_no_rnd(uint8_t *block, const uint8_t *s0,
const uint8_t *s1, int line_size,
int h) attribute_l1_text;
+void ff_bfin_put_pixels16uc_no_rnd(uint8_t *block, const uint8_t *s0,
+ const uint8_t *s1, int line_size,
+ int h) attribute_l1_text;
static void bfin_put_pixels8(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
@@ -86,42 +86,42 @@ static void bfin_put_pixels16_xy2(uint8_t *block, const
uint8_t *s0,
ff_bfin_z_put_pixels16_xy2(block, s0, line_size, line_size, h);
}
-static void bfin_put_pixels8_nornd(uint8_t *block, const uint8_t *pixels,
- ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_no_rnd(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
{
- ff_bfin_put_pixels8uc_nornd(block, pixels, pixels, line_size, h);
+ ff_bfin_put_pixels8uc_no_rnd(block, pixels, pixels, line_size, h);
}
-static void bfin_put_pixels8_x2_nornd(uint8_t *block, const uint8_t *pixels,
- ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_x2_no_rnd(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
{
- ff_bfin_put_pixels8uc_nornd(block, pixels, pixels + 1, line_size, h);
+ ff_bfin_put_pixels8uc_no_rnd(block, pixels, pixels + 1, line_size, h);
}
-static void bfin_put_pixels8_y2_nornd(uint8_t *block, const uint8_t *pixels,
- ptrdiff_t line_size, int h)
+static void bfin_put_pixels8_y2_no_rnd(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
{
- ff_bfin_put_pixels8uc_nornd(block, pixels, pixels + line_size,
- line_size, h);
+ ff_bfin_put_pixels8uc_no_rnd(block, pixels, pixels + line_size,
+ line_size, h);
}
-static void bfin_put_pixels16_nornd(uint8_t *block, const uint8_t *pixels,
- ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_no_rnd(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
{
- ff_bfin_put_pixels16uc_nornd(block, pixels, pixels, line_size, h);
+ ff_bfin_put_pixels16uc_no_rnd(block, pixels, pixels, line_size, h);
}
-static void bfin_put_pixels16_x2_nornd(uint8_t *block, const uint8_t *pixels,
- ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_x2_no_rnd(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
{
- ff_bfin_put_pixels16uc_nornd(block, pixels, pixels + 1, line_size, h);
+ ff_bfin_put_pixels16uc_no_rnd(block, pixels, pixels + 1, line_size, h);
}
-static void bfin_put_pixels16_y2_nornd(uint8_t *block, const uint8_t *pixels,
- ptrdiff_t line_size, int h)
+static void bfin_put_pixels16_y2_no_rnd(uint8_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size, int h)
{
- ff_bfin_put_pixels16uc_nornd(block, pixels, pixels + line_size,
- line_size, h);
+ ff_bfin_put_pixels16uc_no_rnd(block, pixels, pixels + line_size,
+ line_size, h);
}
av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags)
@@ -136,11 +136,11 @@ av_cold void ff_hpeldsp_init_bfin(HpelDSPContext *c, int
flags)
c->put_pixels_tab[1][2] = bfin_put_pixels8_y2;
c->put_pixels_tab[1][3] = bfin_put_pixels8_xy2;
- c->put_no_rnd_pixels_tab[1][0] = bfin_put_pixels8_nornd;
- c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_nornd;
- c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_nornd;
+ c->put_no_rnd_pixels_tab[1][0] = bfin_put_pixels8_no_rnd;
+ c->put_no_rnd_pixels_tab[1][1] = bfin_put_pixels8_x2_no_rnd;
+ c->put_no_rnd_pixels_tab[1][2] = bfin_put_pixels8_y2_no_rnd;
- c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_nornd;
- c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_nornd;
- c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd;
+ c->put_no_rnd_pixels_tab[0][0] = bfin_put_pixels16_no_rnd;
+ c->put_no_rnd_pixels_tab[0][1] = bfin_put_pixels16_x2_no_rnd;
+ c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_no_rnd;
}
--
1.8.3.2
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
