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/aacdec.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/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index f53803bd6d..26bdea1ecc 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -55,6 +55,7 @@ #include "aacsbr.h" #include "mpeg4audio.h" #include "aacadtsdec.h" +#include "profiles.h" #include "libavutil/intfloat.h" #include <errno.h> @@ -555,7 +556,7 @@ AVCodec ff_aac_decoder = { .channel_layouts = aac_channel_layout, .flush = flush, .priv_class = &aac_decoder_class, - .profiles = profiles, + .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), }; /* @@ -579,5 +580,5 @@ AVCodec ff_aac_latm_decoder = { .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .channel_layouts = aac_channel_layout, .flush = flush, - .profiles = profiles, + .profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles), }; |