diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 21:13:34 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 21:13:34 +0400 |
commit | 3ac51145304f9996152a80f5a191ced7b857a252 (patch) | |
tree | 4dfcddd2c641e53647a105fab3f32eede7173557 /libavcodec/dv.c | |
parent | 6d2df3c00a7899e9c06e3a460d64e4d0ccde0fae (diff) | |
parent | e63b818dbe6060b606ae10eb184859f8b97d2353 (diff) |
Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'
* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
dv: Properly split decoder and encoder initialization
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.c')
-rw-r--r-- | libavcodec/dv.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index c3c32864c5..745ebfe7c9 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -235,7 +235,6 @@ int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const DVprofile *d) av_cold int ff_dvvideo_init(AVCodecContext *avctx) { DVVideoContext *s = avctx->priv_data; - DSPContext dsp; static int done = 0; int i, j; @@ -292,30 +291,6 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx) ff_free_vlc(&dv_vlc); } - /* Generic DSP setup */ - memset(&dsp,0, sizeof(dsp)); - ff_dsputil_init(&dsp, avctx); - ff_set_cmp(&dsp, dsp.ildct_cmp, avctx->ildct_cmp); - s->get_pixels = dsp.get_pixels; - s->ildct_cmp = dsp.ildct_cmp[5]; - - /* 88DCT setup */ - s->fdct[0] = dsp.fdct; - s->idct_put[0] = dsp.idct_put; - for (i = 0; i < 64; i++) - s->dv_zigzag[0][i] = dsp.idct_permutation[ff_zigzag_direct[i]]; - - /* 248DCT setup */ - s->fdct[1] = dsp.fdct248; - s->idct_put[1] = ff_simple_idct248_put; // FIXME: need to add it to DSP - if (avctx->lowres){ - for (i = 0; i < 64; i++){ - int j = ff_dv_zigzag248_direct[i]; - s->dv_zigzag[1][i] = dsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2]; - } - }else - memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, sizeof(s->dv_zigzag[1])); - s->avctx = avctx; avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; |