Mercurial > libavcodec.hg

comparison dsputil.c @ 9975:d6d7e8d4a04d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not redundantly check for both CONFIG_THEORA_DECODER and CONFIG_VP3_DECODER. The Theora decoder depends on the VP3 decoder.
author diego
date Wed, 22 Jul 2009 22:27:10 +0000
parents c7420bfe4da0
children 3141f69e3905
comparison
equal deleted inserted replaced
9974:2ccd77e59b0e 9975:d6d7e8d4a04d
4361 if(avctx->idct_algo==FF_IDCT_INT){ 4361 if(avctx->idct_algo==FF_IDCT_INT){
4362 c->idct_put= ff_jref_idct_put; 4362 c->idct_put= ff_jref_idct_put;
4363 c->idct_add= ff_jref_idct_add; 4363 c->idct_add= ff_jref_idct_add;
4364 c->idct = j_rev_dct; 4364 c->idct = j_rev_dct;
4365 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; 4365 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
4366 }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER || CONFIG_THEORA_DECODER ) && 4366 }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER ) &&
4367 avctx->idct_algo==FF_IDCT_VP3){ 4367 avctx->idct_algo==FF_IDCT_VP3){
4368 c->idct_put= ff_vp3_idct_put_c; 4368 c->idct_put= ff_vp3_idct_put_c;
4369 c->idct_add= ff_vp3_idct_add_c; 4369 c->idct_add= ff_vp3_idct_add_c;
4370 c->idct = ff_vp3_idct_c; 4370 c->idct = ff_vp3_idct_c;
4371 c->idct_permutation_type= FF_NO_IDCT_PERM; 4371 c->idct_permutation_type= FF_NO_IDCT_PERM;
4634 if (CONFIG_ANY_H263) { 4634 if (CONFIG_ANY_H263) {
4635 c->h263_h_loop_filter= h263_h_loop_filter_c; 4635 c->h263_h_loop_filter= h263_h_loop_filter_c;
4636 c->h263_v_loop_filter= h263_v_loop_filter_c; 4636 c->h263_v_loop_filter= h263_v_loop_filter_c;
4637 } 4637 }
4638 4638
4639 if (CONFIG_VP3_DECODER || CONFIG_THEORA_DECODER) { 4639 if (CONFIG_VP3_DECODER) {
4640 c->vp3_h_loop_filter= ff_vp3_h_loop_filter_c; 4640 c->vp3_h_loop_filter= ff_vp3_h_loop_filter_c;
4641 c->vp3_v_loop_filter= ff_vp3_v_loop_filter_c; 4641 c->vp3_v_loop_filter= ff_vp3_v_loop_filter_c;
4642 } 4642 }
4643 if (CONFIG_VP6_DECODER) { 4643 if (CONFIG_VP6_DECODER) {
4644 c->vp6_filter_diag4= ff_vp6_filter_diag4_c; 4644 c->vp6_filter_diag4= ff_vp6_filter_diag4_c;