summaryrefslogtreecommitdiff
path: root/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
committerTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
commitf7813a5324be39d13ab536c245d15dfc602a7849 (patch)
treefad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/arm/hpeldsp_init_arm.c
parentb7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff)
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/arm/hpeldsp_init_arm.c')
-rw-r--r--ffmpeg/libavcodec/arm/hpeldsp_init_arm.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c b/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c
index bae93eb..2cc2b78 100644
--- a/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c
+++ b/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c
@@ -20,7 +20,9 @@
*/
#include "libavutil/arm/cpu.h"
+#include "libavutil/attributes.h"
#include "libavcodec/bit_depth_template.c" // for CALL_2X_PIXELS
+#include "libavcodec/rnd_avg.h"
#include "hpeldsp_arm.h"
void ff_put_pixels8_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h);
@@ -41,7 +43,7 @@ CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2_arm, ff_put_no_rnd_pixels8_x2_arm, 8)
CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm, ff_put_no_rnd_pixels8_y2_arm, 8)
CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_put_no_rnd_pixels8_xy2_arm,8)
-void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags)
+av_cold void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags)
{
int cpu_flags = av_get_cpu_flags();
@@ -63,6 +65,8 @@ void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags)
c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_arm;
c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm;
- if (have_armv6(cpu_flags)) ff_hpeldsp_init_armv6(c, flags);
- if (have_neon(cpu_flags)) ff_hpeldsp_init_neon(c, flags);
+ if (have_armv6(cpu_flags))
+ ff_hpeldsp_init_armv6(c, flags);
+ if (have_neon(cpu_flags))
+ ff_hpeldsp_init_neon(c, flags);
}