# HG changeset patch
# User bcoudurier
# Date 1172744943 0
# Node ID c81aa982b72b8bcb086d25fae02784ab3864585d
# Parent  d9c2365b346ae0ed2721b3d6a68e9a590235639f
get rid of CODEC_FLAG_H263P_AIC with next major bump

diff -r d9c2365b346a -r c81aa982b72b avcodec.h
--- a/avcodec.h	Thu Mar 01 10:24:07 2007 +0000
+++ b/avcodec.h	Thu Mar 01 10:29:03 2007 +0000
@@ -355,7 +355,9 @@
 #define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< place global headers in extradata instead of every keyframe
 #define CODEC_FLAG_BITEXACT       0x00800000 ///< use only bitexact stuff (except (i)dct)
 /* Fx : Flag for h263+ extra options */
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 #define CODEC_FLAG_H263P_AIC      0x01000000 ///< H263 Advanced intra coding / MPEG4 AC prediction (remove this)
+#endif
 #define CODEC_FLAG_AC_PRED        0x01000000 ///< H263 Advanced intra coding / MPEG4 AC prediction
 #define CODEC_FLAG_H263P_UMV      0x02000000 ///< Unlimited motion vector
 #define CODEC_FLAG_CBP_RD         0x04000000 ///< use rate distortion optimization for cbp
diff -r d9c2365b346a -r c81aa982b72b mpegvideo.c
--- a/mpegvideo.c	Thu Mar 01 10:24:07 2007 +0000
+++ b/mpegvideo.c	Thu Mar 01 10:29:03 2007 +0000
@@ -1233,7 +1233,7 @@
         s->h263_plus = 1;
         /* Fx */
         s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0;
-        s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0;
+        s->h263_aic= (avctx->flags & CODEC_FLAG_AC_PRED) ? 1:0;
         s->modified_quant= s->h263_aic;
         s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0;
         s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0;