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/dcadec.c | |
| parent | 5f2d12b82494220f2fa65bd3295617e09ef25cad (diff) | |
| parent | 2c6811397bdf13d43ca206e48d6d6da9c2cd47c6 (diff) | |
| download | ffmpeg-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/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 4283adf99f..e9120a1907 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -49,6 +49,7 @@ #include "get_bits.h" #include "internal.h" #include "mathops.h" +#include "profiles.h" #include "synth_filter.h" #if ARCH_ARM @@ -2030,15 +2031,6 @@ static av_cold int dca_decode_end(AVCodecContext *avctx) return 0; } -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_UNKNOWN }, -}; - static const AVOption options[] = { { "disable_xch", "disable decoding of the XCh extension", offsetof(DCAContext, xch_disable), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM }, { "disable_xll", "disable decoding of the XLL extension", offsetof(DCAContext, xll_disable), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM }, @@ -2065,6 +2057,6 @@ AVCodec ff_dca_decoder = { .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .profiles = NULL_IF_CONFIG_SMALL(profiles), + .profiles = NULL_IF_CONFIG_SMALL(ff_dca_profiles), .priv_class = &dca_decoder_class, }; |