[SCM] libav/experimental: Add a few CONFIG_MPEG4_DECODER that should be there.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 51ce2207c8fd3ee72d74e0a559962beaa895c234
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Jan 8 04:00:06 2010 +0000

    Add a few CONFIG_MPEG4_DECODER that should be there.
    
    Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index e3a3f29..fd1c41a 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -1481,7 +1481,7 @@ int ff_h263_resync(MpegEncContext *s){
 
     if(show_bits(&s->gb, 16)==0){
         pos= get_bits_count(&s->gb);
-        if(s->codec_id==CODEC_ID_MPEG4)
+        if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4)
             ret= mpeg4_decode_video_packet_header(s);
         else
             ret= h263_decode_gob_header(s);
@@ -1498,7 +1498,7 @@ int ff_h263_resync(MpegEncContext *s){
             GetBitContext bak= s->gb;
 
             pos= get_bits_count(&s->gb);
-            if(s->codec_id==CODEC_ID_MPEG4)
+            if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4)
                 ret= mpeg4_decode_video_packet_header(s);
             else
                 ret= h263_decode_gob_header(s);
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index d2fcabd..f2cb976 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -172,7 +172,7 @@ static int decode_slice(MpegEncContext *s){
     if(s->partitioned_frame){
         const int qscale= s->qscale;
 
-        if(s->codec_id==CODEC_ID_MPEG4){
+        if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4){
             if(ff_mpeg4_decode_partitions(s) < 0)
                 return -1;
         }

-- 
Libav/FFmpeg packaging