Mercurial > libavcodec.hg

changeset 10032:29c9829a9684 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not check for both CONFIG_H263_ENCODER and CONFIG_H263P_ENCODER. The latter can never be enabled without the former.
author diego
date Wed, 05 Aug 2009 15:22:16 +0000
parents 198e05b139ef
children 3466a2a6fe06
files mpegvideo_enc.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo_enc.c	Wed Aug 05 15:21:36 2009 +0000
+++ b/mpegvideo_enc.c	Wed Aug 05 15:22:16 2009 +0000
@@ -1724,7 +1724,7 @@
     case CODEC_ID_FLV1:
     case CODEC_ID_RV10:
     case CODEC_ID_RV20:
-        if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER)
+        if (CONFIG_H263_ENCODER || CONFIG_FLV_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_H263P_ENCODER || CONFIG_FLV_ENCODER)
+        if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER)
             s->gob_index = ff_h263_get_gob_height(s);
         break;
     case CODEC_ID_MPEG4:
@@ -2156,7 +2156,7 @@
                     break;
                     case CODEC_ID_H263:
                     case CODEC_ID_H263P:
-                        if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER)
+                        if (CONFIG_H263_ENCODER)
                             h263_encode_gob_header(s, mb_y);
                     break;
                     }
@@ -2682,7 +2682,7 @@
         case CODEC_ID_H263:
         case CODEC_ID_H263P:
         case CODEC_ID_FLV1:
-            if (CONFIG_H263_ENCODER||CONFIG_H263P_ENCODER||CONFIG_FLV_ENCODER)
+            if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER)
                 ff_clean_h263_qscales(s);
             break;
         }