diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 12:11:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 12:11:13 +0200 |
| commit | 3841f2ae665d527a7c8b3c226925995256adb917 (patch) | |
| tree | 62a2f32ee938ff94386dfe6d5771d1d05d40f165 /libavcodec/xvididct.c | |
| parent | 64d029de41ed556b765df50c7080b06fd5a86417 (diff) | |
| parent | d35b94fbabd8beb5d566c0b5d01688aff62c3b36 (diff) | |
Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'
* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
avcodec: Rename xvidmmx IDCT to xvid
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xvididct.c')
| -rw-r--r-- | libavcodec/xvididct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xvididct.c b/libavcodec/xvididct.c index 0c61fb5312..8645af439a 100644 --- a/libavcodec/xvididct.c +++ b/libavcodec/xvididct.c @@ -28,7 +28,7 @@ av_cold void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx) if (high_bit_depth || avctx->lowres || !(avctx->idct_algo == FF_IDCT_AUTO || - avctx->idct_algo == FF_IDCT_XVIDMMX)) + avctx->idct_algo == FF_IDCT_XVID)) return; if (ARCH_X86) |