diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:11:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:19:08 +0200 |
| commit | c4010972c4a7bd1f5f38cf8a75faf7a57da10ee9 (patch) | |
| tree | f162756b8a21ef9f09fdd9b569364474caca4181 /libavcodec/arm/hpeldsp_arm.h | |
| parent | 055e5c8e01c57783207861c96a5affbcd9e40160 (diff) | |
| parent | 7384b7a71338d960e421d6dc3d77da09b0a442cb (diff) | |
| download | ffmpeg-c4010972c4a7bd1f5f38cf8a75faf7a57da10ee9.tar.gz | |
Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'
* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb':
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/hpeldsp_arm.S
libavcodec/arm/hpeldsp_arm.h
libavcodec/arm/hpeldsp_armv6.S
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/arm/hpeldsp_init_armv6.c
libavcodec/arm/hpeldsp_init_neon.c
libavcodec/arm/hpeldsp_neon.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/hpeldsp_arm.h')
| -rw-r--r-- | libavcodec/arm/hpeldsp_arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/hpeldsp_arm.h b/libavcodec/arm/hpeldsp_arm.h index e79bc6fb21..3f18c624d8 100644 --- a/libavcodec/arm/hpeldsp_arm.h +++ b/libavcodec/arm/hpeldsp_arm.h @@ -23,7 +23,7 @@ #include "libavcodec/hpeldsp.h" -void ff_hpeldsp_init_armv6(HpelDSPContext* c, int flags); +void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags); void ff_hpeldsp_init_neon(HpelDSPContext *c, int flags); #endif /* AVCODEC_ARM_HPELDSP_H */ |