# HG changeset patch # User michael # Date 1262923206 0 # Node ID c03a8c6c755b16c2fc416249253f9f11e858f962 # Parent 4605bd2fdb7f7cf6da555d1c6a05669694f7aa80 Add a few CONFIG_MPEG4_DECODER that should be there. diff -r 4605bd2fdb7f -r c03a8c6c755b h263.c --- 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); diff -r 4605bd2fdb7f -r c03a8c6c755b h263dec.c --- 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; }