Merge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'

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

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/arm/vp6dsp_init_arm.c
Simple merge

diff --cc libavcodec/vp5.c
Simple merge

diff --cc libavcodec/vp56.c
index 9d4162bb963dbcb594ef6b748c5db48aa06ce577,39d82e9c157882b2530c86dbc5c84eed5c1b72a8..4751840943ecddf0aa675d1408acbbe63e6efa4c
--- 1/libavcodec/vp56.c
--- 2/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@@ -768,9 -663,8 +768,8 @@@ av_cold int ff_vp56_init_context(AVCode
      ff_hpeldsp_init(&s->hdsp, avctx->flags);
      ff_videodsp_init(&s->vdsp, 8);
      ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
-     ff_vp56dsp_init(&s->vp56dsp, avctx->codec->id);
      for (i = 0; i < 64; i++) {
 -#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
 +#define TRANSPOSE(x) (((x) >> 3) | (((x) & 7) << 3))
          s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]);
  #undef TRANSPOSE
      }

diff --cc libavcodec/vp56.h
Simple merge

diff --cc libavcodec/vp56dsp.c
Simple merge

diff --cc libavcodec/vp56dsp.h
Simple merge

diff --cc libavcodec/vp6.c
index c7e8f13282ae54364ad12213b2672608e12e44da,40948ad0c5948d50357a8958c90ca3e70cef2fdb..645fc5c690e03d2f30f945433d4d1356236fa446
--- 1/libavcodec/vp6.c
--- 2/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@@ -631,22 -612,8 +631,24 @@@ static av_cold int vp6_decode_init(AVCo
      if ((ret = ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6,
                              avctx->codec->id == AV_CODEC_ID_VP6A)) < 0)
          return ret;
+     ff_vp6dsp_init(&s->vp56dsp);
  
 +    vp6_decode_init_context(s);
 +
 +    if (s->has_alpha) {
 +        s->alpha_context = av_mallocz(sizeof(VP56Context));
 +        ff_vp56_init_context(avctx, s->alpha_context,
 +                             s->flip == -1, s->has_alpha);
++        ff_vp6dsp_init(&s->alpha_context->vp56dsp);
 +        vp6_decode_init_context(s->alpha_context);
 +    }
 +
 +    return 0;
 +}
 +
 +static av_cold void vp6_decode_init_context(VP56Context *s)
 +{
 +    s->deblock_filtering = 0;
      s->vp56_coord_div = vp6_coord_div;
      s->parse_vector_adjustment = vp6_parse_vector_adjustment;
      s->filter = vp6_filter;

diff --cc libavcodec/x86/vp6dsp_init.c
Simple merge