diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-07-17 16:47:43 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-07-18 10:32:19 +0100 |
| commit | 28f9ab7029bd1a02f659995919f899f84ee7361b (patch) | |
| tree | cc5544768e088acef9f18e0c8038f72bd1a91b9d /libavcodec/dsputil.c | |
| parent | ab9f9876615fd856184912cf3863a80cf3a721b6 (diff) | |
| download | ffmpeg-28f9ab7029bd1a02f659995919f899f84ee7361b.tar.gz | |
vp3: move idct and loop filter pointers to new vp3dsp context
This moves all VP3-specific function pointers from dsputil to a
new vp3dsp context. There is no reason to ever use the VP3 IDCT
where an MPEG2 IDCT is expected or vice versa.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 15f184e406..46232d800a 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2701,12 +2701,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->idct_add= ff_jref_idct_add; c->idct = ff_j_rev_dct; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; - }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER ) && - avctx->idct_algo==FF_IDCT_VP3){ - c->idct_put= ff_vp3_idct_put_c; - c->idct_add= ff_vp3_idct_add_c; - c->idct = ff_vp3_idct_c; - c->idct_permutation_type= FF_NO_IDCT_PERM; }else if(avctx->idct_algo==FF_IDCT_WMV2){ c->idct_put= ff_wmv2_idct_put_c; c->idct_add= ff_wmv2_idct_add_c; @@ -2867,12 +2861,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->h263_v_loop_filter= h263_v_loop_filter_c; } - if (CONFIG_VP3_DECODER) { - c->vp3_h_loop_filter= ff_vp3_h_loop_filter_c; - c->vp3_v_loop_filter= ff_vp3_v_loop_filter_c; - c->vp3_idct_dc_add= ff_vp3_idct_dc_add_c; - } - c->h261_loop_filter= h261_loop_filter_c; c->try_8x8basis= try_8x8basis_c; |