Commit 965424da authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Do not check for both CONFIG_H263_ENCODER and CONFIG_H263P_ENCODER.

The latter can never be enabled without the former.

Originally committed as revision 19596 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fe629c2d
......@@ -1724,7 +1724,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
case CODEC_ID_FLV1:
case CODEC_ID_RV10:
case CODEC_ID_RV20:
if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER)
if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER)
h263_encode_mb(s, s->block, motion_x, motion_y);
break;
case CODEC_ID_MJPEG:
......@@ -2038,7 +2038,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
case CODEC_ID_H263:
case CODEC_ID_H263P:
case CODEC_ID_FLV1:
if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER)
if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER)
s->gob_index = ff_h263_get_gob_height(s);
break;
case CODEC_ID_MPEG4:
......@@ -2156,7 +2156,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
break;
case CODEC_ID_H263:
case CODEC_ID_H263P:
if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER)
if (CONFIG_H263_ENCODER)
h263_encode_gob_header(s, mb_y);
break;
}
......@@ -2682,7 +2682,7 @@ static int estimate_qp(MpegEncContext *s, int dry_run){
case CODEC_ID_H263:
case CODEC_ID_H263P:
case CODEC_ID_FLV1:
if (CONFIG_H263_ENCODER||CONFIG_H263P_ENCODER||CONFIG_FLV_ENCODER)
if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER)
ff_clean_h263_qscales(s);
break;
}
......
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