[FFmpeg-cvslog] r19596 - trunk/libavcodec/mpegvideo_enc.c
diego
subversion
Wed Aug 5 17:22:16 CEST 2009
Author: diego
Date: Wed Aug 5 17:22:16 2009
New Revision: 19596
Log:
Do not check for both CONFIG_H263_ENCODER and CONFIG_H263P_ENCODER.
The latter can never be enabled without the former.
Modified:
trunk/libavcodec/mpegvideo_enc.c
Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c Wed Aug 5 17:21:36 2009 (r19595)
+++ trunk/libavcodec/mpegvideo_enc.c Wed Aug 5 17:22:16 2009 (r19596)
@@ -1724,7 +1724,7 @@ static av_always_inline void encode_mb_i
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
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
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
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;
}
More information about the ffmpeg-cvslog
mailing list