[FFmpeg-cvslog] r19593 - in trunk/libavcodec: h263.h mpegvideo_enc.c

[diego]

Author: diego
Date: Wed Aug  5 12:46:43 2009
New Revision: 19593

Log:
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.

Modified:
   trunk/libavcodec/h263.h
   trunk/libavcodec/mpegvideo_enc.c

Modified: trunk/libavcodec/h263.h
==============================================================================
--- trunk/libavcodec/h263.h	Wed Aug  5 12:44:12 2009	(r19592)
+++ trunk/libavcodec/h263.h	Wed Aug  5 12:46:43 2009	(r19593)
@@ -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)

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Wed Aug  5 12:44:12 2009	(r19592)
+++ trunk/libavcodec/mpegvideo_enc.c	Wed Aug  5 12:46:43 2009	(r19593)
@@ -1724,8 +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  || 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: