Revision ce5e49b0 libavcodec/libx264.c

View differences:

libavcodec/libx264.c
110 110

  
111 111
        x4->pic.i_pts  = frame->pts;
112 112
        x4->pic.i_type =
113
            frame->pict_type == FF_I_TYPE ? X264_TYPE_KEYFRAME :
114
            frame->pict_type == FF_P_TYPE ? X264_TYPE_P :
115
            frame->pict_type == FF_B_TYPE ? X264_TYPE_B :
113
            frame->pict_type == AV_PICTURE_TYPE_I ? X264_TYPE_KEYFRAME :
114
            frame->pict_type == AV_PICTURE_TYPE_P ? X264_TYPE_P :
115
            frame->pict_type == AV_PICTURE_TYPE_B ? X264_TYPE_B :
116 116
                                            X264_TYPE_AUTO;
117 117
        if (x4->params.b_tff != frame->top_field_first) {
118 118
            x4->params.b_tff = frame->top_field_first;
......
135 135
    switch (pic_out.i_type) {
136 136
    case X264_TYPE_IDR:
137 137
    case X264_TYPE_I:
138
        x4->out_pic.pict_type = FF_I_TYPE;
138
        x4->out_pic.pict_type = AV_PICTURE_TYPE_I;
139 139
        break;
140 140
    case X264_TYPE_P:
141
        x4->out_pic.pict_type = FF_P_TYPE;
141
        x4->out_pic.pict_type = AV_PICTURE_TYPE_P;
142 142
        break;
143 143
    case X264_TYPE_B:
144 144
    case X264_TYPE_BREF:
145
        x4->out_pic.pict_type = FF_B_TYPE;
145
        x4->out_pic.pict_type = AV_PICTURE_TYPE_B;
146 146
        break;
147 147
    }
148 148

  

Also available in: Unified diff