AVCodec mpeg_xvmc_vld_decoder = {
    "mpegvideo_xvmc",
=======
#if CONFIG_MPEG_VDPAU_DECODER
AVCodec mpeg_vdpau_decoder = {
    "mpegvideo_vdpau",
>>>>>>> 38811d62363f34bfd1bc581f7c6d6f6d446a37a6:libavcodec/mpeg12.c
    CODEC_TYPE_VIDEO,
<<<<<<< HEAD:libavcodec/mpeg12.c
    CODEC_ID_MPEG2VIDEO_XVMC,
=======
    CODEC_ID_MPEG2VIDEO,
>>>>>>> 38811d62363f34bfd1bc581f7c6d6f6d446a37a6:libavcodec/mpeg12.c
    sizeof(Mpeg1Context),
<<<<<<< HEAD:libavcodec/mpeg12.c
    mpeg_xxmc_decode_init,
=======
    mpeg_decode_init,
>>>>>>> 38811d62363f34bfd1bc581f7c6d6f6d446a37a6:libavcodec/mpeg12.c
    NULL,
    mpeg_decode_end,
    mpeg_decode_frame,
<<<<<<< HEAD:libavcodec/mpeg12.c
    CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL,
=======
    CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY,
>>>>>>> 38811d62363f34bfd1bc581f7c6d6f6d446a37a6:libavcodec/mpeg12.c
    .flush= ff_mpeg_flush,
<<<<<<< HEAD:libavcodec/mpeg12.c
=======
    .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"),
>>>>>>> 38811d62363f34bfd1bc581f7c6d6f6d446a37a6:libavcodec/mpeg12.c
};
<<<<<<< HEAD:libavcodec/mpeg12.c
=======
#endif
>>>>>>> 38811d62363f34bfd1bc581f7c6d6f6d446a37a6:libavcodec/mpeg12.c

<<<<<<< HEAD:libavcodec/mpeg12.c
=======
#if CONFIG_MPEG1_VDPAU_DECODER
AVCodec mpeg1_vdpau_decoder = {