Commit f34121f3 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

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
parent 3f35415d
......@@ -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 */
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment