# HG changeset patch
# User diego
# Date 1249469203 0
# Node ID 67a1b27648b2337db2f9880ef050a43af1d169e9
# Parent  f9f378b1c145091a03d8c7ff2e2a64139651ef29
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.

diff -r f9f378b1c145 -r 67a1b27648b2 h263.h
--- a/h263.h	Wed Aug 05 10:44:12 2009 +0000
+++ b/h263.h	Wed Aug 05 10:46:43 2009 +0000
@@ -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 -r f9f378b1c145 -r 67a1b27648b2 mpegvideo_enc.c
--- a/mpegvideo_enc.c	Wed Aug 05 10:44:12 2009 +0000
+++ b/mpegvideo_enc.c	Wed Aug 05 10:46:43 2009 +0000
@@ -1724,8 +1724,7 @@
     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: