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/libdcadec.c | |
| parent | 5f2d12b82494220f2fa65bd3295617e09ef25cad (diff) | |
| parent | 2c6811397bdf13d43ca206e48d6d6da9c2cd47c6 (diff) | |
| download | ffmpeg-streaming-5e8b05345243cdec3ca01116ce130da812ffed3d.zip ffmpeg-streaming-5e8b05345243cdec3ca01116ce130da812ffed3d.tar.gz | |
Merge commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6'
* commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6':
lavc: add profiles to AVCodecDescriptor
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/libdcadec.c')
| -rw-r--r-- | libavcodec/libdcadec.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c index 79fa331..7d1f931 100644 --- a/libavcodec/libdcadec.c +++ b/libavcodec/libdcadec.c @@ -29,6 +29,7 @@ #include "dca.h" #include "dca_syncwords.h" #include "internal.h" +#include "profiles.h" typedef struct DCADecContext { const AVClass *class; @@ -292,16 +293,6 @@ static const AVClass dcadec_class = { .category = AV_CLASS_CATEGORY_DECODER, }; -static const AVProfile profiles[] = { - { FF_PROFILE_DTS, "DTS" }, - { FF_PROFILE_DTS_ES, "DTS-ES" }, - { FF_PROFILE_DTS_96_24, "DTS 96/24" }, - { FF_PROFILE_DTS_HD_HRA, "DTS-HD HRA" }, - { FF_PROFILE_DTS_HD_MA, "DTS-HD MA" }, - { FF_PROFILE_DTS_EXPRESS, "DTS Express" }, - { FF_PROFILE_UNKNOWN }, -}; - AVCodec ff_libdcadec_decoder = { .name = "libdcadec", .long_name = NULL_IF_CONFIG_SMALL("dcadec DCA decoder"), @@ -316,5 +307,5 @@ AVCodec ff_libdcadec_decoder = { .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, .priv_class = &dcadec_class, - .profiles = NULL_IF_CONFIG_SMALL(profiles), + .profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles), }; |
