# HG changeset patch
# User diego
# Date 1249486042 0
# Node ID ea2422aa4635ca57299bcfa2407c2ea43e615b50
# Parent  3466a2a6fe0640a11c27d5c776de3f8e89f97423
Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER.
The latter can never be enabled without the former.

diff -r 3466a2a6fe06 -r ea2422aa4635 mpegvideo_enc.c
--- a/mpegvideo_enc.c	Wed Aug 05 15:26:54 2009 +0000
+++ b/mpegvideo_enc.c	Wed Aug 05 15:27:22 2009 +0000
@@ -1724,7 +1724,7 @@
     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 @@
     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 @@
         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;
         }