diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:24:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:24:25 +0200 |
| commit | 6ec26157b96b74a26c5148bffbf862920a1afc34 (patch) | |
| tree | e42fc16ac43e0ce3d5a03f596b50b4c03caebae6 /libavcodec/hpeldsp.h | |
| parent | fdb1f7eb7a802eec63a051499110842f3056cf9b (diff) | |
| parent | 2957d29f0531ccd8a6f4378293424dfd92db3044 (diff) | |
Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpeldsp.h')
| -rw-r--r-- | libavcodec/hpeldsp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index bd53edd682..8e68729d8a 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -97,12 +97,12 @@ typedef struct HpelDSPContext { void ff_hpeldsp_init(HpelDSPContext *c, int flags); -void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_bfin(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_ppc(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_sh4(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_vis(HpelDSPContext* c, int flags); -void ff_hpeldsp_init_x86(HpelDSPContext* c, int flags); +void ff_hpeldsp_init_alpha(HpelDSPContext *c, int flags); +void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags); +void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags); +void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags); +void ff_hpeldsp_init_sh4(HpelDSPContext *c, int flags); +void ff_hpeldsp_init_vis(HpelDSPContext *c, int flags); +void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags); #endif /* AVCODEC_HPELDSP_H */ |