Do not redundantly check for preprocessor definitions of CONFIG_RV10_ENCODER or

CONFIG_RV20_ENCODER when also checking for CONFIG_H263_ENCODER.
The RV10/RV20 encoders depend on the H.263 encoder.

Originally committed as revision 19593 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index fcd821c74c06aa064bd74bada567e83cacbf4903..b89bf1b923077561c01441ba2ad1531a3210a42c 100644 (file)
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -36,8 +36,6 @@
 #define CONFIG_ANY_H263_ENCODER (CONFIG_H263_ENCODER    || \
                                  CONFIG_H263P_ENCODER   || \
                                  CONFIG_FLV_ENCODER     || \
-                                 CONFIG_RV10_ENCODER    || \
-                                 CONFIG_RV20_ENCODER    || \
                                  CONFIG_MPEG4_ENCODER   || \
                                  CONFIG_MSMPEG4_ENCODER || \
                                  CONFIG_WMV_ENCODER)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index c72f41204bf6318f9c020bb33de65aa8a8ad7e91..d62420af2fa2ceb10bd10a996fdc1bfac31eab2b 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1724,8 +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  || CONFIG_RV10_ENCODER  || CONFIG_RV20_ENCODER)
+        if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER)
             h263_encode_mb(s, s->block, motion_x, motion_y);
         break;
     case CODEC_ID_MJPEG: