[FFmpeg-cvslog] r21082 - in trunk/libavcodec: h263.c h263dec.c

[michael]

Author: michael
Date: Fri Jan  8 05:00:06 2010
New Revision: 21082

Log:
Add a few CONFIG_MPEG4_DECODER that should be there.

Modified:
   trunk/libavcodec/h263.c
   trunk/libavcodec/h263dec.c

Modified: trunk/libavcodec/h263.c
==============================================================================
--- trunk/libavcodec/h263.c	Fri Jan  8 04:43:48 2010	(r21081)
+++ trunk/libavcodec/h263.c	Fri Jan  8 05:00:06 2010	(r21082)
@@ -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);

Modified: trunk/libavcodec/h263dec.c
==============================================================================
--- trunk/libavcodec/h263dec.c	Fri Jan  8 04:43:48 2010	(r21081)
+++ trunk/libavcodec/h263dec.c	Fri Jan  8 05:00:06 2010	(r21082)
@@ -172,7 +172,7 @@ static int decode_slice(MpegEncContext *
     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;
         }