comparison h264.c @ 6019:42de24a34fd2 libavcodec

Fix brain-dead parts of r11216, specifically: Actually unreference removed pics And check for too many reference frames as originally intended, not equal to max reference frames.

6018:9d1654835629

        h->short_ref[0]->long_ref=0;
        h->short_ref_count++;
        s->current_picture_ptr->reference |= s->picture_structure;
    }

    if (h->sps.ref_frame_count &&
            h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){

        /* We have too many reference frames, probably due to corrupted
         * stream. Need to discard one frame. Prevents overrun of the
         * short_ref and long_ref buffers.
         */

            for (i = 0; i < 16; ++i)
                if (h->long_ref[i])
                    break;

            assert(i < 16);
            remove_long_at_index(h, i);
        } else {
            remove_short_at_index(h, h->short_ref_count - 1);
        }
    }

    print_short_term(h);
    print_long_term(h);
    return 0;

6019:42de24a34fd2

        h->short_ref[0]->long_ref=0;
        h->short_ref_count++;
        s->current_picture_ptr->reference |= s->picture_structure;
    }

    if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){

        /* We have too many reference frames, probably due to corrupted
         * stream. Need to discard one frame. Prevents overrun of the
         * short_ref and long_ref buffers.
         */

            for (i = 0; i < 16; ++i)
                if (h->long_ref[i])
                    break;

            assert(i < 16);
            pic = h->long_ref[i];
            remove_long_at_index(h, i);
        } else {
            pic = h->short_ref[h->short_ref_count - 1];
            remove_short_at_index(h, h->short_ref_count - 1);
        }
        unreference_pic(h, pic, 0);
    }

    print_short_term(h);
    print_long_term(h);
    return 0;