Revision 0215006a libavcodec/vc1dec.c

View differences:

libavcodec/vc1dec.c
3098 3098
            return -1;
3099 3099
        }
3100 3100
    }
3101
    avctx->profile = v->profile;
3102
    if (v->profile == PROFILE_ADVANCED)
3103
        avctx->level = v->level;
3104

  
3101 3105
    avctx->has_b_frames= !!(avctx->max_b_frames);
3102 3106
    s->low_delay = !avctx->has_b_frames;
3103 3107

  
......
3345 3349
    return 0;
3346 3350
}
3347 3351

  
3352
static const AVProfile profiles[] = {
3353
    { FF_PROFILE_VC1_SIMPLE,   "Simple"   },
3354
    { FF_PROFILE_VC1_MAIN,     "Main"     },
3355
    { FF_PROFILE_VC1_COMPLEX,  "Complex"  },
3356
    { FF_PROFILE_VC1_ADVANCED, "Advanced" },
3357
    { FF_PROFILE_UNKNOWN },
3358
};
3348 3359

  
3349 3360
AVCodec ff_vc1_decoder = {
3350 3361
    "vc1",
......
3358 3369
    CODEC_CAP_DR1 | CODEC_CAP_DELAY,
3359 3370
    NULL,
3360 3371
    .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
3361
    .pix_fmts = ff_hwaccel_pixfmt_list_420
3372
    .pix_fmts = ff_hwaccel_pixfmt_list_420,
3373
    .profiles = NULL_IF_CONFIG_SMALL(profiles)
3362 3374
};
3363 3375

  
3364 3376
#if CONFIG_WMV3_DECODER
......
3374 3386
    CODEC_CAP_DR1 | CODEC_CAP_DELAY,
3375 3387
    NULL,
3376 3388
    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
3377
    .pix_fmts = ff_hwaccel_pixfmt_list_420
3389
    .pix_fmts = ff_hwaccel_pixfmt_list_420,
3390
    .profiles = NULL_IF_CONFIG_SMALL(profiles)
3378 3391
};
3379 3392
#endif
3380 3393

  
......
3391 3404
    CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
3392 3405
    NULL,
3393 3406
    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"),
3394
    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE}
3407
    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE},
3408
    .profiles = NULL_IF_CONFIG_SMALL(profiles)
3395 3409
};
3396 3410
#endif
3397 3411

  
......
3408 3422
    CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
3409 3423
    NULL,
3410 3424
    .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"),
3411
    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE}
3425
    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE},
3426
    .profiles = NULL_IF_CONFIG_SMALL(profiles)
3412 3427
};
3413 3428
#endif

Also available in: Unified diff