@@ -245,8 +245,6 @@ OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o \ | |||||
OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o \ | OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o \ | ||||
mpegaudiodecheader.o mpegaudio.o \ | mpegaudiodecheader.o mpegaudio.o \ | ||||
mpegaudiodata.o | mpegaudiodata.o | ||||
OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o \ | |||||
mpegvideo.o error_resilience.o | |||||
OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o | OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o | ||||
OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \ | OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \ | ||||
mpegvideo.o error_resilience.o | mpegvideo.o error_resilience.o | ||||
@@ -145,7 +145,6 @@ void avcodec_register_all(void) | |||||
REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video); | REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video); | ||||
REGISTER_ENCDEC (MPEG4, mpeg4); | REGISTER_ENCDEC (MPEG4, mpeg4); | ||||
REGISTER_DECODER (MPEG4_VDPAU, mpeg4_vdpau); | REGISTER_DECODER (MPEG4_VDPAU, mpeg4_vdpau); | ||||
REGISTER_DECODER (MPEGVIDEO, mpegvideo); | |||||
REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau); | REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau); | ||||
REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau); | REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau); | ||||
REGISTER_DECODER (MSMPEG4V1, msmpeg4v1); | REGISTER_DECODER (MSMPEG4V1, msmpeg4v1); | ||||
@@ -2522,21 +2522,6 @@ AVCodec ff_mpeg2video_decoder = { | |||||
.profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles), | .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles), | ||||
}; | }; | ||||
//legacy decoder | |||||
AVCodec ff_mpegvideo_decoder = { | |||||
.name = "mpegvideo", | |||||
.type = AVMEDIA_TYPE_VIDEO, | |||||
.id = CODEC_ID_MPEG2VIDEO, | |||||
.priv_data_size = sizeof(Mpeg1Context), | |||||
.init = mpeg_decode_init, | |||||
.close = mpeg_decode_end, | |||||
.decode = mpeg_decode_frame, | |||||
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, | |||||
.flush = flush, | |||||
.max_lowres = 3, | |||||
.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), | |||||
}; | |||||
#if CONFIG_MPEG_XVMC_DECODER | #if CONFIG_MPEG_XVMC_DECODER | ||||
static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx) | static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx) | ||||
{ | { | ||||