summaryrefslogtreecommitdiff
path: root/libavcodec/libxvidff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-08 15:03:17 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-08 15:03:17 +0000
commitd578432db86762cb131c6b8ac57d20338a866bdb (patch)
treeeec47febaaa12af65e76c32e0306830140ffc946 /libavcodec/libxvidff.c
parentdd1c8f3e6e5380f993c86750bb09fd42e130143f (diff)
Remove stuff under #if LIBAVCODEC_VERSION_INT.
Originally committed as revision 15263 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libxvidff.c')
-rw-r--r--libavcodec/libxvidff.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index aa55bf338c..36f27c7eed 100644
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -100,9 +100,6 @@ av_cold int ff_xvid_encode_init(AVCodecContext *avctx) {
if( xvid_flags & CODEC_FLAG_4MV )
x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */
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 )