Mercurial > libavcodec.hg

diff libxvidff.c @ 7034:130784da5595 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniformize trellis quant option
author bcoudurier
date Mon, 09 Jun 2008 00:43:07 +0000
parents 25dcd46b8160
children e943e1409077
line wrap: on
line diff
--- a/libxvidff.c	Sun Jun 08 21:09:02 2008 +0000
+++ b/libxvidff.c	Mon Jun 09 00:43:07 2008 +0000
@@ -99,7 +99,11 @@
     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 */