diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:29:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:31:11 +0200 |
| commit | c5a11ab6d1067f8306b318b9fda10b106389cea0 (patch) | |
| tree | e446d1af6c80b81af25bfe5e919965fd6e1778cf /libavcodec/hpeldsp.h | |
| parent | c4010972c4a7bd1f5f38cf8a75faf7a57da10ee9 (diff) | |
| parent | bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075 (diff) | |
Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'
* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/bfin/Makefile
libavcodec/bfin/hpel_pixels_bfin.S
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/bfin/hpeldsp_bfin.h
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpeldsp.h')
| -rw-r--r-- | libavcodec/hpeldsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index a6a2ff0e41..bd53edd682 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -100,9 +100,9 @@ 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_x86(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 */ |