diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-19 15:36:37 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-19 17:15:24 -0300 |
| commit | 6966a5e4d79cc1c3bc3c8c02baf5804e24584ac0 (patch) | |
| tree | ca8c3596a3910242e2de501995dd026d6b45ae22 /libavcodec/arm/vp6dsp_init_arm.c | |
| parent | 663640d745279a272398283d8dca7efa356c8fe8 (diff) | |
| parent | 721d57e608dc4fd6c86f27c5ae76ef559d646220 (diff) | |
| download | ffmpeg-streaming-6966a5e4d79cc1c3bc3c8c02baf5804e24584ac0.zip ffmpeg-streaming-6966a5e4d79cc1c3bc3c8c02baf5804e24584ac0.tar.gz | |
Merge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'
* commit '721d57e608dc4fd6c86f27c5ae76ef559d646220':
vp56: Separate VP5 and VP6 dsp initialization
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm/vp6dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/vp6dsp_init_arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/vp6dsp_init_arm.c b/libavcodec/arm/vp6dsp_init_arm.c index a2f986c..a59d612 100644 --- a/libavcodec/arm/vp6dsp_init_arm.c +++ b/libavcodec/arm/vp6dsp_init_arm.c @@ -22,13 +22,13 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/avcodec.h" + #include "libavcodec/vp56dsp.h" void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, ptrdiff_t stride, int t); void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, ptrdiff_t stride, int t); -av_cold void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec) +av_cold void ff_vp6dsp_init_arm(VP56DSPContext *s) { int cpu_flags = av_get_cpu_flags(); |
