Mercurial > libavcodec.hg
comparison h264.c @ 7391:f04e3411ef31 libavcodec
indent
author | michael |
---|---|
date | Fri, 25 Jul 2008 12:26:24 +0000 |
parents | 7abedf6425d8 |
children | 95787edebd24 |
comparison
equal
deleted
inserted
replaced
7390:7abedf6425d8 | 7391:f04e3411ef31 |
---|---|
3565 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference " | 3565 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term reference " |
3566 "assignment for second field " | 3566 "assignment for second field " |
3567 "in complementary field pair " | 3567 "in complementary field pair " |
3568 "(first field is long term)\n"); | 3568 "(first field is long term)\n"); |
3569 } else { | 3569 } else { |
3570 pic= remove_short(h, s->current_picture_ptr->frame_num); | 3570 pic= remove_short(h, s->current_picture_ptr->frame_num); |
3571 if(pic){ | 3571 if(pic){ |
3572 unreference_pic(h, pic, 0); | 3572 unreference_pic(h, pic, 0); |
3573 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); | 3573 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
3574 } | 3574 } |
3575 | 3575 |
3576 if(h->short_ref_count) | 3576 if(h->short_ref_count) |
3577 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); | 3577 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
3578 | 3578 |
3579 h->short_ref[0]= s->current_picture_ptr; | 3579 h->short_ref[0]= s->current_picture_ptr; |
3580 h->short_ref[0]->long_ref=0; | 3580 h->short_ref[0]->long_ref=0; |
3581 h->short_ref_count++; | 3581 h->short_ref_count++; |
3582 s->current_picture_ptr->reference |= s->picture_structure; | 3582 s->current_picture_ptr->reference |= s->picture_structure; |
3583 } | 3583 } |
3584 } | 3584 } |
3585 | 3585 |
3586 if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){ | 3586 if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){ |
3587 | 3587 |
3588 /* We have too many reference frames, probably due to corrupted | 3588 /* We have too many reference frames, probably due to corrupted |