[FFmpeg-cvslog] r19598 - trunk/libavcodec/mpegvideo_enc.c

[diego]

Author: diego
Date: Wed Aug  5 17:27:22 2009
New Revision: 19598

Log:
Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER.
The latter can never be enabled without the former.

Modified:
   trunk/libavcodec/mpegvideo_enc.c

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Wed Aug  5 17:26:54 2009	(r19597)
+++ trunk/libavcodec/mpegvideo_enc.c	Wed Aug  5 17:27:22 2009	(r19598)
@@ -1724,7 +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_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 
     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
         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;
         }