diff options
Diffstat (limited to 'libavcodec/xvididct.c')
| -rw-r--r-- | libavcodec/xvididct.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/xvididct.c b/libavcodec/xvididct.c index ca89703233..e9fab70cbb 100644 --- a/libavcodec/xvididct.c +++ b/libavcodec/xvididct.c @@ -3,20 +3,20 @@ * * Copyright (C) 2006-2011 Xvid Solutions GmbH * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -334,9 +334,12 @@ av_cold void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx) { const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8; - if (!high_bit_depth && - (avctx->idct_algo == FF_IDCT_AUTO || - avctx->idct_algo == FF_IDCT_XVID)) { + if (high_bit_depth || avctx->lowres || + !(avctx->idct_algo == FF_IDCT_AUTO || + avctx->idct_algo == FF_IDCT_XVID)) + return; + + if (avctx->idct_algo == FF_IDCT_XVID) { c->idct_put = xvid_idct_put; c->idct_add = xvid_idct_add; c->idct = ff_xvid_idct; |