diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-12-28 17:36:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-12-28 17:36:03 +0000 |
| commit | f34121f3511dd7b02c4353b32d9458fad1772e38 (patch) | |
| tree | e122b84c7a2aa823300f61b3e8e4dcf4a0e7108c | |
| parent | 3f35415df7d05f56d7c2501c6ddd3f35a9131191 (diff) | |
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.
Originally committed as revision 20950 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.h | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index b89bf1b923..1f8dbe11b4 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -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 */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d7e7c4c726..f63a7fbf71 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -707,7 +707,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) 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 @@ static int encode_thread(AVCodecContext *c, void *arg){ } 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 @@ static int encode_thread(AVCodecContext *c, void *arg){ // 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 @@ static int encode_thread(AVCodecContext *c, void *arg){ 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 @@ static int encode_picture(MpegEncContext *s, int picture_number) 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: |