[SCM] libav/experimental: 2 more if(CONFIG_*_DECODER)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0b60f3bdf52bfbfc6052fa332ef6623336cd6d0b
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Jan 7 06:32:34 2010 +0000

    2 more if(CONFIG_*_DECODER)
    
    Originally committed as revision 21055 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index e63a210..8940489 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -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);

-- 
Libav/FFmpeg packaging