Merge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'
authorJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 18:36:37 +0000 (15:36 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 20:15:24 +0000 (17:15 -0300)
commit6966a5e4d79cc1c3bc3c8c02baf5804e24584ac0
treeca8c3596a3910242e2de501995dd026d6b45ae22
parent663640d745279a272398283d8dca7efa356c8fe8
parent721d57e608dc4fd6c86f27c5ae76ef559d646220
Merge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'

* commit '721d57e608dc4fd6c86f27c5ae76ef559d646220':
  vp56: Separate VP5 and VP6 dsp initialization

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/arm/vp6dsp_init_arm.c
libavcodec/vp5.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp56dsp.c
libavcodec/vp56dsp.h
libavcodec/vp6.c
libavcodec/x86/vp6dsp_init.c