Mercurial > libavcodec.hg
changeset 10727:47e1e474e1f1 libavcodec
Replace CONFIG_ANY_H263_ENCODER definition by CONFIG_H263_ENCODER.
CONFIG_ANY_H263_ENCODER is just a logical OR of H.263 family definitions,
for which the build system enables CONFIG_H263_ENCODER anyway.
| author | diego |
|---|---|
| date | Mon, 28 Dec 2009 17:36:03 +0000 |
| parents | 1550e82f6183 |
| children | 2dfca3fd89ce |
| files | h263.h mpegvideo_enc.c |
| diffstat | 2 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.h Mon Dec 28 15:27:49 2009 +0000 +++ b/h263.h Mon Dec 28 17:36:03 2009 +0000 @@ -33,12 +33,6 @@ CONFIG_MPEG4_DECODER || \ CONFIG_MSMPEG4_DECODER || \ CONFIG_WMV_DECODER) -#define CONFIG_ANY_H263_ENCODER (CONFIG_H263_ENCODER || \ - CONFIG_H263P_ENCODER || \ - CONFIG_FLV_ENCODER || \ - CONFIG_MPEG4_ENCODER || \ - CONFIG_MSMPEG4_ENCODER || \ - CONFIG_WMV_ENCODER) -#define CONFIG_ANY_H263 (CONFIG_ANY_H263_DECODER || CONFIG_ANY_H263_ENCODER) +#define CONFIG_ANY_H263 (CONFIG_ANY_H263_DECODER || CONFIG_H263_ENCODER) #endif /* AVCODEC_H263_H */
--- a/mpegvideo_enc.c Mon Dec 28 15:27:49 2009 +0000 +++ b/mpegvideo_enc.c Mon Dec 28 17:36:03 2009 +0000 @@ -707,7 +707,7 @@ if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) ff_h261_encode_init(s); - if (CONFIG_ANY_H263_ENCODER && s->out_format == FMT_H263) + if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) h263_encode_init(s); if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) ff_msmpeg4_encode_init(s); @@ -2472,7 +2472,7 @@ } s->last_bits= put_bits_count(&s->pb); - if (CONFIG_ANY_H263_ENCODER && + if (CONFIG_H263_ENCODER && s->out_format == FMT_H263 && s->pict_type!=FF_B_TYPE) ff_h263_update_motion_val(s); @@ -2599,7 +2599,7 @@ // RAL: Update last macroblock type s->last_mv_dir = s->mv_dir; - if (CONFIG_ANY_H263_ENCODER && + if (CONFIG_H263_ENCODER && s->out_format == FMT_H263 && s->pict_type!=FF_B_TYPE) ff_h263_update_motion_val(s); @@ -2630,7 +2630,7 @@ s->dest[2], w>>1, h>>s->chroma_y_shift, s->uvlinesize); } if(s->loop_filter){ - if(CONFIG_ANY_H263_ENCODER && s->out_format == FMT_H263) + if(CONFIG_H263_ENCODER && s->out_format == FMT_H263) ff_h263_loop_filter(s); } //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); @@ -2936,7 +2936,7 @@ rv20_encode_picture_header(s, picture_number); else if (CONFIG_FLV_ENCODER && s->codec_id == CODEC_ID_FLV1) ff_flv_encode_picture_header(s, picture_number); - else if (CONFIG_ANY_H263_ENCODER) + else if (CONFIG_H263_ENCODER) h263_encode_picture_header(s, picture_number); break; case FMT_MPEG1: