# HG changeset patch # User cehoyos # Date 1232124632 0 # Node ID 48c89068a41b6c06cc5575dd2d8b1271aa48ccd1 # Parent 555c2ab21d845eef2e9071bb7910d30ad566b28b Add mpeg1_vdpau decoder. diff -r 555c2ab21d84 -r 48c89068a41b Makefile --- a/Makefile Fri Jan 16 16:20:42 2009 +0000 +++ b/Makefile Fri Jan 16 16:50:32 2009 +0000 @@ -134,6 +134,7 @@ 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 diff -r 555c2ab21d84 -r 48c89068a41b allcodecs.c --- a/allcodecs.c Fri Jan 16 16:20:42 2009 +0000 +++ b/allcodecs.c Fri Jan 16 16:50:32 2009 +0000 @@ -110,6 +110,7 @@ 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); diff -r 555c2ab21d84 -r 48c89068a41b mpeg12.c --- a/mpeg12.c Fri Jan 16 16:20:42 2009 +0000 +++ b/mpeg12.c Fri Jan 16 16:50:32 2009 +0000 @@ -2542,3 +2542,19 @@ }; #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 +