Mercurial > libavcodec.hg
comparison arm/dsputil_arm.c @ 9975:d6d7e8d4a04d libavcodec
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 | 2c1c28f26a27 |
children | 0905f8eed0a9 |
comparison
equal
deleted
inserted
replaced
9974:2ccd77e59b0e | 9975:d6d7e8d4a04d |
---|---|
182 } else if (idct_algo==FF_IDCT_SIMPLENEON){ | 182 } else if (idct_algo==FF_IDCT_SIMPLENEON){ |
183 c->idct_put= ff_simple_idct_put_neon; | 183 c->idct_put= ff_simple_idct_put_neon; |
184 c->idct_add= ff_simple_idct_add_neon; | 184 c->idct_add= ff_simple_idct_add_neon; |
185 c->idct = ff_simple_idct_neon; | 185 c->idct = ff_simple_idct_neon; |
186 c->idct_permutation_type = FF_PARTTRANS_IDCT_PERM; | 186 c->idct_permutation_type = FF_PARTTRANS_IDCT_PERM; |
187 } else if ((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER || CONFIG_THEORA_DECODER) && | 187 } else if ((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER) && |
188 idct_algo==FF_IDCT_VP3){ | 188 idct_algo==FF_IDCT_VP3){ |
189 c->idct_put= ff_vp3_idct_put_neon; | 189 c->idct_put= ff_vp3_idct_put_neon; |
190 c->idct_add= ff_vp3_idct_add_neon; | 190 c->idct_add= ff_vp3_idct_add_neon; |
191 c->idct = ff_vp3_idct_neon; | 191 c->idct = ff_vp3_idct_neon; |
192 c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; | 192 c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; |