diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-05 15:27:22 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-05 15:27:22 +0000 |
| commit | 0bd485300e1a8bb0ba95df53da34562816120e31 (patch) | |
| tree | 78a138ca3a494cf9a2a821cebbb741566a13a7f3 /libavcodec | |
| parent | 4d4b4bd14934d92f0ddcff354e1652520266fdaf (diff) | |
| download | ffmpeg-0bd485300e1a8bb0ba95df53da34562816120e31.tar.gz | |
Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER.
The latter can never be enabled without the former.
Originally committed as revision 19598 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 244bc6b46e..6159078077 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_FLV_ENCODER) + if (CONFIG_H263_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_FLV_ENCODER) + if (CONFIG_H263_ENCODER) s->gob_index = ff_h263_get_gob_height(s); break; case CODEC_ID_MPEG4: @@ -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_FLV_ENCODER) + if (CONFIG_H263_ENCODER) ff_clean_h263_qscales(s); break; } |