comparison libxvidff.c @ 7824:635ed2559262 libavcodec

Remove stuff under #if LIBAVCODEC_VERSION_INT.
author michael
date Mon, 08 Sep 2008 15:03:17 +0000
parents e943e1409077
children cf4d575b1982
comparison
equal deleted inserted replaced
7823:4525dcd81357 7824:635ed2559262
98 /* Bring in VOP flags from ffmpeg command-line */ 98 /* Bring in VOP flags from ffmpeg command-line */
99 x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */ 99 x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */
100 if( xvid_flags & CODEC_FLAG_4MV ) 100 if( xvid_flags & CODEC_FLAG_4MV )
101 x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */ 101 x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */
102 if( avctx->trellis 102 if( avctx->trellis
103 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
104 || xvid_flags & CODEC_FLAG_TRELLIS_QUANT
105 #endif
106 ) 103 )
107 x->vop_flags |= XVID_VOP_TRELLISQUANT; /* Level 5 */ 104 x->vop_flags |= XVID_VOP_TRELLISQUANT; /* Level 5 */
108 if( xvid_flags & CODEC_FLAG_AC_PRED ) 105 if( xvid_flags & CODEC_FLAG_AC_PRED )
109 x->vop_flags |= XVID_VOP_HQACPRED; /* Level 6 */ 106 x->vop_flags |= XVID_VOP_HQACPRED; /* Level 6 */
110 if( xvid_flags & CODEC_FLAG_GRAY ) 107 if( xvid_flags & CODEC_FLAG_GRAY )