Mercurial > libavcodec.hg
comparison h263dec.c @ 5127:4dbe6578f811 libavcodec
misc spelling fixes
author | diego |
---|---|
date | Tue, 12 Jun 2007 09:29:25 +0000 |
parents | 6d45158e0249 |
children | 7622ba533e05 |
comparison
equal
deleted
inserted
replaced
5126:7982b376b58a | 5127:4dbe6578f811 |
---|---|
139 }else if(s->flags&CODEC_FLAG_TRUNCATED){ | 139 }else if(s->flags&CODEC_FLAG_TRUNCATED){ |
140 pos -= s->parse_context.last_index; | 140 pos -= s->parse_context.last_index; |
141 if(pos<0) pos=0; // padding is not really read so this might be -1 | 141 if(pos<0) pos=0; // padding is not really read so this might be -1 |
142 return pos; | 142 return pos; |
143 }else{ | 143 }else{ |
144 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | 144 if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) |
145 if(pos+10>buf_size) pos=buf_size; // oops ;) | 145 if(pos+10>buf_size) pos=buf_size; // oops ;) |
146 | 146 |
147 return pos; | 147 return pos; |
148 } | 148 } |
149 } | 149 } |
380 if (!s->context_initialized) { | 380 if (!s->context_initialized) { |
381 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix | 381 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix |
382 return -1; | 382 return -1; |
383 } | 383 } |
384 | 384 |
385 //we need to set current_picture_ptr before reading the header, otherwise we cant store anyting im there | 385 /* We need to set current_picture_ptr before reading the header, |
386 * otherwise we cannot store anyting in there */ | |
386 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ | 387 if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){ |
387 int i= ff_find_unused_picture(s, 0); | 388 int i= ff_find_unused_picture(s, 0); |
388 s->current_picture_ptr= &s->picture[i]; | 389 s->current_picture_ptr= &s->picture[i]; |
389 } | 390 } |
390 | 391 |
619 #endif | 620 #endif |
620 | 621 |
621 ff_er_frame_start(s); | 622 ff_er_frame_start(s); |
622 | 623 |
623 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type | 624 //the second part of the wmv2 header contains the MB skip bits which are stored in current_picture->mb_type |
624 //which isnt available before MPV_frame_start() | 625 //which is not available before MPV_frame_start() |
625 if (s->msmpeg4_version==5){ | 626 if (s->msmpeg4_version==5){ |
626 if(!ENABLE_WMV2_DECODER || ff_wmv2_decode_secondary_picture_header(s) < 0) | 627 if(!ENABLE_WMV2_DECODER || ff_wmv2_decode_secondary_picture_header(s) < 0) |
627 return -1; | 628 return -1; |
628 } | 629 } |
629 | 630 |