Revision c29e05e6 libavcodec/h264.c

View differences:

libavcodec/h264.c
3551 3551
        }
3552 3552
    }
3553 3553

  
3554
    if (!current_ref_assigned && FIELD_PICTURE &&
3555
            !s->first_field && s->current_picture_ptr->reference) {
3556

  
3554
    if (!current_ref_assigned) {
3557 3555
        /* Second field of complementary field pair; the first field of
3558 3556
         * which is already referenced. If short referenced, it
3559 3557
         * should be first entry in short_ref. If not, it must exist
......
3569 3567
                                             "in complementary field pair "
3570 3568
                                             "(first field is long term)\n");
3571 3569
        } else {
3572
            /*
3573
             * First field in reference, but not in any sensible place on our
3574
             * reference lists. This shouldn't happen unless reference
3575
             * handling somewhere else is wrong.
3576
             */
3577
            assert(0);
3578
        }
3579
        current_ref_assigned = 1;
3580
    }
3581

  
3582
    if(!current_ref_assigned){
3583 3570
        pic= remove_short(h, s->current_picture_ptr->frame_num);
3584 3571
        if(pic){
3585 3572
            unreference_pic(h, pic, 0);

Also available in: Unified diff