Mercurial > libavcodec.hg

changeset 10804:c03a8c6c755b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a few CONFIG_MPEG4_DECODER that should be there.
author michael
date Fri, 08 Jan 2010 04:00:06 +0000
parents 4605bd2fdb7f
children 55a1d93c534c
files h263.c h263dec.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/h263.c	Thu Jan 07 23:53:49 2010 +0000
+++ b/h263.c	Fri Jan 08 04:00:06 2010 +0000
@@ -1481,7 +1481,7 @@
 
     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 @@
             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);
--- a/h263dec.c	Thu Jan 07 23:53:49 2010 +0000
+++ b/h263dec.c	Fri Jan 08 04:00:06 2010 +0000
@@ -172,7 +172,7 @@
     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;
         }