comparison mpegvideo.c @ 4610:c81aa982b72b libavcodec

get rid of CODEC_FLAG_H263P_AIC with next major bump
author bcoudurier
date Thu, 01 Mar 2007 10:29:03 +0000
parents a96d905dcbaa
children 5464e5021a67
comparison
equal deleted inserted replaced
4609:d9c2365b346a 4610:c81aa982b72b
1231 case CODEC_ID_H263P: 1231 case CODEC_ID_H263P:
1232 s->out_format = FMT_H263; 1232 s->out_format = FMT_H263;
1233 s->h263_plus = 1; 1233 s->h263_plus = 1;
1234 /* Fx */ 1234 /* Fx */
1235 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0; 1235 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0;
1236 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0; 1236 s->h263_aic= (avctx->flags & CODEC_FLAG_AC_PRED) ? 1:0;
1237 s->modified_quant= s->h263_aic; 1237 s->modified_quant= s->h263_aic;
1238 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0; 1238 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0;
1239 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; 1239 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0;
1240 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0; 1240 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0;
1241 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; 1241 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;