Revision 3d542120

View differences:

libavcodec/h264.c
1908 1908
            h->prev_frame_num++;
1909 1909
            h->prev_frame_num %= 1<<h->sps.log2_max_frame_num;
1910 1910
            s->current_picture_ptr->frame_num= h->prev_frame_num;
1911
            ff_h264_execute_ref_pic_marking(h, NULL, 0);
1911
            ff_generate_sliding_window_mmcos(h);
1912
            ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);
1912 1913
        }
1913 1914

  
1914 1915
        /* See if we have a decoded first field looking for a pair... */
libavcodec/h264_refs.c
478 478
    MpegEncContext * const s = &h->s;
479 479
    assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
480 480

  
481
    h->mmco_index= 0;
481 482
    if(h->short_ref_count && h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
482 483
            !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) {
483 484
        h->mmco[0].opcode= MMCO_SHORT2UNUSED;

Also available in: Unified diff