diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 16:16:57 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 16:20:39 +0100 |
| commit | 5e8b05345243cdec3ca01116ce130da812ffed3d (patch) | |
| tree | 497704c9f07bbee3858e88ba95780688fa2aad0d /libavcodec/mpeg12dec.c | |
| parent | 5f2d12b82494220f2fa65bd3295617e09ef25cad (diff) | |
| parent | 2c6811397bdf13d43ca206e48d6d6da9c2cd47c6 (diff) | |
Merge commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6'
* commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6':
lavc: add profiles to AVCodecDescriptor
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 66bc4dc61b..23c77cdb33 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 |