[SCM] libav/experimental: get rid of CODEC_FLAG_H263P_AIC with next major bump

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6b936ec6622e0ffe4181ba4fb9a9a192f3f2b79f
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Mar 1 10:29:03 2007 +0000

    get rid of CODEC_FLAG_H263P_AIC with next major bump
    
    Originally committed as revision 8167 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ebba425..1b36cda 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -355,7 +355,9 @@ typedef struct RcOverride{
 #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 --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 493827e..89e333a 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1233,7 +1233,7 @@ int MPV_encode_init(AVCodecContext *avctx)
         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;

-- 
Libav/FFmpeg packaging