@@ -994,6 +994,7 @@ mpeg1video_encoder_select="aandct"

 mpeg2video_encoder_select="aandct"

 mpeg4_encoder_select="aandct"

 mpeg_vdpau_decoder_deps="vdpau"

+mpeg1_vdpau_decoder_deps="vdpau"

 mpeg_xvmc_decoder_deps="xvmc X11_extensions_XvMClib_h"

 msmpeg4v1_encoder_select="aandct"

 msmpeg4v2_encoder_select="aandct"

@@ -134,6 +134,7 @@ OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o mpegaudiodec.o mpegaudiod

 OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o

 OBJS-$(CONFIG_MDEC_DECODER)            += mdec.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_MPEG_VDPAU_DECODER)      += vdpauvideo.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

+OBJS-$(CONFIG_MPEG1_VDPAU_DECODER)     += vdpauvideo.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

@@ -110,6 +110,7 @@ void avcodec_register_all(void)

     REGISTER_ENCDEC  (MPEG4, mpeg4);

     REGISTER_DECODER (MPEGVIDEO, mpegvideo);

     REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau);

+    REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau);

     REGISTER_ENCDEC  (MSMPEG4V1, msmpeg4v1);

     REGISTER_ENCDEC  (MSMPEG4V2, msmpeg4v2);

     REGISTER_ENCDEC  (MSMPEG4V3, msmpeg4v3);

@@ -2542,3 +2542,19 @@ AVCodec mpeg_vdpau_decoder = {

 };

 #endif

+#if CONFIG_MPEG1_VDPAU_DECODER

+AVCodec mpeg1_vdpau_decoder = {

+    "mpeg1video_vdpau",

+    CODEC_TYPE_VIDEO,

+    CODEC_ID_MPEG1VIDEO,

+    sizeof(Mpeg1Context),

+    mpeg_decode_init,

+    NULL,

+    mpeg_decode_end,

+    mpeg_decode_frame,

+    CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY,

+    .flush= ff_mpeg_flush,

+    .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"),

+};

+#endif

+