[FFmpeg-cvslog] r21055 - trunk/libavcodec/h263dec.c

[michael]

Author: michael
Date: Thu Jan  7 07:32:34 2010
New Revision: 21055

Log:
2 more if(CONFIG_*_DECODER)

Modified:
   trunk/libavcodec/h263dec.c

Modified: trunk/libavcodec/h263dec.c
==============================================================================
--- trunk/libavcodec/h263dec.c	Thu Jan  7 07:25:41 2010	(r21054)
+++ trunk/libavcodec/h263dec.c	Thu Jan  7 07:32:34 2010	(r21055)
@@ -405,7 +405,7 @@ retry:
         ret= ff_wmv2_decode_picture_header(s);
     } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) {
         ret = msmpeg4_decode_picture_header(s);
-    } else if (s->h263_pred) {
+    } else if (CONFIG_MPEG4_DECODER && s->h263_pred) {
         if(s->avctx->extradata_size && s->picture_number==0){
             GetBitContext gb;
 
@@ -413,7 +413,7 @@ retry:
             ret = ff_mpeg4_decode_picture_header(s, &gb);
         }
         ret = ff_mpeg4_decode_picture_header(s, &s->gb);
-    } else if (s->codec_id == CODEC_ID_H263I) {
+    } else if (CONFIG_H263I_DECODER && s->codec_id == CODEC_ID_H263I) {
         ret = ff_intel_h263_decode_picture_header(s);
     } else if (CONFIG_FLV_DECODER && s->h263_flv) {
         ret = ff_flv_decode_picture_header(s);