diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-09 00:43:07 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-06-09 00:43:07 +0000 |
| commit | febea2f2e13f7cdc7659f2b15281f06eb77eaf07 (patch) | |
| tree | d80259ecb4435c11682c4508788e8ca8b2e1b06b /libavcodec/libxvidff.c | |
| parent | 7080cbe2c828271fd75f9281b8b62020778db79a (diff) | |
| download | ffmpeg-febea2f2e13f7cdc7659f2b15281f06eb77eaf07.tar.gz | |
uniformize trellis quant option
Originally committed as revision 13722 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libxvidff.c')
| -rw-r--r-- | libavcodec/libxvidff.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index fa5b118d00..bc4359a5b9 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -99,7 +99,11 @@ av_cold int ff_xvid_encode_init(AVCodecContext *avctx) { x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */ if( xvid_flags & CODEC_FLAG_4MV ) x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */ - if( xvid_flags & CODEC_FLAG_TRELLIS_QUANT) + if( avctx->trellis +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + || xvid_flags & CODEC_FLAG_TRELLIS_QUANT +#endif + ) x->vop_flags |= XVID_VOP_TRELLISQUANT; /* Level 5 */ if( xvid_flags & CODEC_FLAG_AC_PRED ) x->vop_flags |= XVID_VOP_HQACPRED; /* Level 6 */ |