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/codec_desc.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/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 9cad3e6e47..a445c565e6 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -24,6 +24,7 @@ #include "libavutil/common.h" #include "libavutil/internal.h" #include "avcodec.h" +#include "profiles.h" #include "version.h" #define MT(...) (const char *const[]){ __VA_ARGS__, NULL } @@ -43,6 +44,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "mpeg2video", .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg2_video_profiles), }, #if FF_API_XVMC { @@ -102,6 +104,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "mpeg4", .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_mpeg4_video_profiles), }, { .id = AV_CODEC_ID_RAWVIDEO, @@ -207,6 +210,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "h264", .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), }, { .id = AV_CODEC_ID_INDEO3, @@ -473,6 +477,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "vc1", .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles), }, { .id = AV_CODEC_ID_WMV3, @@ -480,6 +485,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "wmv3", .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles), }, { .id = AV_CODEC_ID_LOCO, @@ -602,6 +608,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .mime_types= MT("image/jp2"), + .profiles = NULL_IF_CONFIG_SMALL(ff_jpeg2000_profiles), }, { .id = AV_CODEC_ID_VMNC, @@ -1202,6 +1209,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "hevc", .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), }, { .id = AV_CODEC_ID_FIC, @@ -2097,6 +2105,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "aac", .long_name = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"), .props = AV_CODEC_PROP_LOSSY, + .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), }, { .id = AV_CODEC_ID_AC3, @@ -2111,6 +2120,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "dts", .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + .profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles), }, { .id = AV_CODEC_ID_VORBIS, |