X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpeg12dec.c;h=23c77cdb333d83bba0e08b30e3f5e4650649780c;hb=033e7dbd31c5956f4c18d099cac7a5869b7c29e8;hp=66bc4dc61be515abe443bdc1b69ec827622717d0;hpb=31ae2308b3f6c1021d79da69c504490239895d60;p=ffmpeg diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 66bc4dc61be..23c77cdb333 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -44,6 +44,7 @@ #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodata.h" +#include "profiles.h" #include "thread.h" #include "version.h" #include "vdpau_compat.h" @@ -2855,18 +2856,6 @@ static av_cold int mpeg_decode_end(AVCodecContext *avctx) return 0; } -static const AVProfile mpeg2_video_profiles[] = { - { FF_PROFILE_MPEG2_422, "4:2:2" }, - { FF_PROFILE_MPEG2_HIGH, "High" }, - { FF_PROFILE_MPEG2_SS, "Spatially Scalable" }, - { FF_PROFILE_MPEG2_SNR_SCALABLE, "SNR Scalable" }, - { FF_PROFILE_MPEG2_MAIN, "Main" }, - { FF_PROFILE_MPEG2_SIMPLE, "Simple" }, - { FF_PROFILE_RESERVED, "Reserved" }, - { FF_PROFILE_RESERVED, "Reserved" }, - { FF_PROFILE_UNKNOWN }, -}; - AVCodec ff_mpeg1video_decoder = { .name = "mpeg1video", .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), @@ -2898,7 +2887,7 @@ AVCodec ff_mpeg2video_decoder = { AV_CODEC_CAP_SLICE_THREADS, .flush = flush, .max_lowres = 3, - .profiles = NULL_IF_CONFIG_SMALL(mpeg2_video_profiles), + .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), }; //legacy decoder