diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-25 16:52:02 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-27 23:06:26 +0200 |
| commit | 15946eb8a940416d9792c65900273d674f9c152a (patch) | |
| tree | 3632cf528d5b6be842338300d6c88cdc5148b5e7 /libavcodec | |
| parent | cf543c6574faa196bb7d2f04f2811269e9ec50c0 (diff) | |
| download | ffmpeg-15946eb8a940416d9792c65900273d674f9c152a.tar.gz | |
lavc: remove "legacy" mpegvideo decoder.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 15 |
3 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9dfde53eb7..421072ee88 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -245,8 +245,6 @@ OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o \ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o \ mpegaudiodecheader.o mpegaudio.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_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o \ mpegvideo.o error_resilience.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 107ec310e0..23d2252f98 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -145,7 +145,6 @@ void avcodec_register_all(void) REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video); REGISTER_ENCDEC (MPEG4, mpeg4); REGISTER_DECODER (MPEG4_VDPAU, mpeg4_vdpau); - REGISTER_DECODER (MPEGVIDEO, mpegvideo); REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau); REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau); REGISTER_DECODER (MSMPEG4V1, msmpeg4v1); diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 226bde36ac..eefcb7b45e 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2522,21 +2522,6 @@ AVCodec ff_mpeg2video_decoder = { .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 static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx) { |