diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-05 15:22:16 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-05 15:22:16 +0000 |
| commit | 965424dad112211fc5887d96bd093773c133416c (patch) | |
| tree | 0c89c18d2735c041546b7618f4e8a92c90462aff | |
| parent | fe629c2d2c4eb9346bf4816372726ffb33a51685 (diff) | |
| download | ffmpeg-965424dad112211fc5887d96bd093773c133416c.tar.gz | |
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
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d62420af2f..244bc6b46e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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; } |