Revision ce5e49b0 libavformat/utils.c

View differences:

libavformat/utils.c
896 896
    if((s->flags & AVFMT_FLAG_IGNDTS) && pkt->pts != AV_NOPTS_VALUE)
897 897
        pkt->dts= AV_NOPTS_VALUE;
898 898

  
899
    if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == FF_B_TYPE)
899
    if (st->codec->codec_id != CODEC_ID_H264 && pc && pc->pict_type == AV_PICTURE_TYPE_B)
900 900
        //FIXME Set low_delay = 0 when has_b_frames = 1
901 901
        st->codec->has_b_frames = 1;
902 902

  
......
912 912
    /* XXX: need has_b_frame, but cannot get it if the codec is
913 913
        not initialized */
914 914
    if (delay &&
915
        pc && pc->pict_type != FF_B_TYPE)
915
        pc && pc->pict_type != AV_PICTURE_TYPE_B)
916 916
        presentation_delayed = 1;
917 917

  
918 918
    if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && pkt->dts > pkt->pts && st->pts_wrap_bits<63
......
1040 1040
        /* keyframe computation */
1041 1041
        if (pc->key_frame == 1)
1042 1042
            pkt->flags |= AV_PKT_FLAG_KEY;
1043
        else if (pc->key_frame == -1 && pc->pict_type == FF_I_TYPE)
1043
        else if (pc->key_frame == -1 && pc->pict_type == AV_PICTURE_TYPE_I)
1044 1044
            pkt->flags |= AV_PKT_FLAG_KEY;
1045 1045
    }
1046 1046
    if (pc)

Also available in: Unified diff