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/vp56.c | |
| 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/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 9d4162bb96..4751840943 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -768,7 +768,6 @@ av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, 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)) s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]); |