diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 19:14:41 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 19:14:41 +0400 |
commit | 5f61e09a8f28af45d7db1f5e7767d14322255f49 (patch) | |
tree | df4e8ce30cb60c7fe5a559529dcd2a03bdc22afb /libavcodec/bfin | |
parent | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (diff) | |
parent | 93af2734ee609133eaeca28329d7f13241dd411f (diff) |
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
* commit '93af2734ee609133eaeca28329d7f13241dd411f':
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
-rw-r--r-- | libavcodec/bfin/dsputil_bfin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c index 434d2a7190..a1dcb14224 100644 --- a/libavcodec/bfin/dsputil_bfin.c +++ b/libavcodec/bfin/dsputil_bfin.c @@ -257,7 +257,8 @@ void ff_dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx ) if (avctx->dct_algo == FF_DCT_AUTO) c->fdct = ff_bfin_fdct; - if (avctx->idct_algo == FF_IDCT_VP3) { + // FIXME convert to VP3DSPContext + if (0) { // avctx->idct_algo == FF_IDCT_VP3) { c->idct_permutation_type = FF_NO_IDCT_PERM; c->idct = ff_bfin_vp3_idct; c->idct_add = ff_bfin_vp3_idct_add; |