Mercurial > libavcodec.hg
comparison h263dec.c @ 10760:c199eb2ad4ec libavcodec
It appears s->bitstream_buffer_size has to be 0 at the end so rather use assert.
author | michael |
---|---|
date | Fri, 01 Jan 2010 21:07:52 +0000 |
parents | 95f3daa991a2 |
children | 1d22da3122b9 |
comparison
equal
deleted
inserted
replaced
10759:2bcd7a44350f | 10760:c199eb2ad4ec |
---|---|
665 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==FF_I_TYPE) | 665 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==FF_I_TYPE) |
666 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ | 666 if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ |
667 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; | 667 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; |
668 } | 668 } |
669 | 669 |
670 assert(s->bitstream_buffer_size==0); | |
670 /* divx 5.01+ bistream reorder stuff */ | 671 /* divx 5.01+ bistream reorder stuff */ |
671 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_packed){ | 672 if(s->codec_id==CODEC_ID_MPEG4 && s->divx_packed){ |
672 int current_pos= get_bits_count(&s->gb)>>3; | 673 int current_pos= get_bits_count(&s->gb)>>3; |
673 int startcode_found=0; | 674 int startcode_found=0; |
674 | 675 |
675 if(buf_size - current_pos > 5){ | 676 if(buf_size - current_pos > 5){ |
676 int i; | 677 int i; |