Mercurial > libavcodec.hg
comparison h263.c @ 10804:c03a8c6c755b libavcodec
Add a few CONFIG_MPEG4_DECODER that should be there.
| author | michael |
|---|---|
| date | Fri, 08 Jan 2010 04:00:06 +0000 |
| parents | 4605bd2fdb7f |
| children | 514dc1c87b2e |
comparison
equal
deleted
inserted
replaced
| 10803:4605bd2fdb7f | 10804:c03a8c6c755b |
|---|---|
| 1479 align_get_bits(&s->gb); | 1479 align_get_bits(&s->gb); |
| 1480 } | 1480 } |
| 1481 | 1481 |
| 1482 if(show_bits(&s->gb, 16)==0){ | 1482 if(show_bits(&s->gb, 16)==0){ |
| 1483 pos= get_bits_count(&s->gb); | 1483 pos= get_bits_count(&s->gb); |
| 1484 if(s->codec_id==CODEC_ID_MPEG4) | 1484 if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4) |
| 1485 ret= mpeg4_decode_video_packet_header(s); | 1485 ret= mpeg4_decode_video_packet_header(s); |
| 1486 else | 1486 else |
| 1487 ret= h263_decode_gob_header(s); | 1487 ret= h263_decode_gob_header(s); |
| 1488 if(ret>=0) | 1488 if(ret>=0) |
| 1489 return pos; | 1489 return pos; |
| 1496 for(;left>16+1+5+5; left-=8){ | 1496 for(;left>16+1+5+5; left-=8){ |
| 1497 if(show_bits(&s->gb, 16)==0){ | 1497 if(show_bits(&s->gb, 16)==0){ |
| 1498 GetBitContext bak= s->gb; | 1498 GetBitContext bak= s->gb; |
| 1499 | 1499 |
| 1500 pos= get_bits_count(&s->gb); | 1500 pos= get_bits_count(&s->gb); |
| 1501 if(s->codec_id==CODEC_ID_MPEG4) | 1501 if(CONFIG_MPEG4_DECODER && s->codec_id==CODEC_ID_MPEG4) |
| 1502 ret= mpeg4_decode_video_packet_header(s); | 1502 ret= mpeg4_decode_video_packet_header(s); |
| 1503 else | 1503 else |
| 1504 ret= h263_decode_gob_header(s); | 1504 ret= h263_decode_gob_header(s); |
| 1505 if(ret>=0) | 1505 if(ret>=0) |
| 1506 return pos; | 1506 return pos; |