Revision ce5e49b0 libavcodec/dxa.c

View differences:

libavcodec/dxa.c
240 240
    switch(compr){
241 241
    case -1:
242 242
        c->pic.key_frame = 0;
243
        c->pic.pict_type = FF_P_TYPE;
243
        c->pic.pict_type = AV_PICTURE_TYPE_P;
244 244
        if(c->prev.data[0])
245 245
            memcpy(c->pic.data[0], c->prev.data[0], c->pic.linesize[0] * avctx->height);
246 246
        else{ // Should happen only when first frame is 'NULL'
247 247
            memset(c->pic.data[0], 0, c->pic.linesize[0] * avctx->height);
248 248
            c->pic.key_frame = 1;
249
            c->pic.pict_type = FF_I_TYPE;
249
            c->pic.pict_type = AV_PICTURE_TYPE_I;
250 250
        }
251 251
        break;
252 252
    case 2:
......
254 254
    case 4:
255 255
    case 5:
256 256
        c->pic.key_frame = !(compr & 1);
257
        c->pic.pict_type = (compr & 1) ? FF_P_TYPE : FF_I_TYPE;
257
        c->pic.pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
258 258
        for(j = 0; j < avctx->height; j++){
259 259
            if(compr & 1){
260 260
                for(i = 0; i < avctx->width; i++)
......
269 269
    case 12: // ScummVM coding
270 270
    case 13:
271 271
        c->pic.key_frame = 0;
272
        c->pic.pict_type = FF_P_TYPE;
272
        c->pic.pict_type = AV_PICTURE_TYPE_P;
273 273
        decode_13(avctx, c, c->pic.data[0], srcptr, c->prev.data[0]);
274 274
        break;
275 275
    default:

Also available in: Unified diff