diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-19 21:36:37 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-19 23:15:24 +0300 |
| commit | 6966a5e4d79cc1c3bc3c8c02baf5804e24584ac0 (patch) | |
| tree | ca8c3596a3910242e2de501995dd026d6b45ae22 /libavcodec/vp56dsp.h | |
| parent | 663640d745279a272398283d8dca7efa356c8fe8 (diff) | |
| parent | 721d57e608dc4fd6c86f27c5ae76ef559d646220 (diff) | |
Merge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'
* commit '721d57e608dc4fd6c86f27c5ae76ef559d646220':
vp56: Separate VP5 and VP6 dsp initialization
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vp56dsp.h')
| -rw-r--r-- | libavcodec/vp56dsp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vp56dsp.h b/libavcodec/vp56dsp.h index 9249c4732e..e35e232ea3 100644 --- a/libavcodec/vp56dsp.h +++ b/libavcodec/vp56dsp.h @@ -24,8 +24,6 @@ #include <stddef.h> #include <stdint.h> -#include "avcodec.h" - typedef struct VP56DSPContext { void (*edge_filter_hor)(uint8_t *yuv, ptrdiff_t stride, int t); void (*edge_filter_ver)(uint8_t *yuv, ptrdiff_t stride, int t); @@ -37,8 +35,10 @@ typedef struct VP56DSPContext { void ff_vp6_filter_diag4_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride, const int16_t *h_weights, const int16_t *v_weights); -void ff_vp56dsp_init(VP56DSPContext *s, enum AVCodecID codec); -void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec); -void ff_vp6dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec); +void ff_vp5dsp_init(VP56DSPContext *s); +void ff_vp6dsp_init(VP56DSPContext *s); + +void ff_vp6dsp_init_arm(VP56DSPContext *s); +void ff_vp6dsp_init_x86(VP56DSPContext *s); #endif /* AVCODEC_VP56DSP_H */ |