diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-10-17 03:15:44 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-10-17 03:17:27 +0100 |
| commit | e9299df7a6dfb03464c121c945af5e8ea07be035 (patch) | |
| tree | c0b9e8e50756c25ad3793cc4991044caeac19ff2 /libavcodec/aacenctab.h | |
| parent | 3835554bf8ed78539a3492c239f979c0ab03a15f (diff) | |
| download | ffmpeg-e9299df7a6dfb03464c121c945af5e8ea07be035.tar.gz | |
aacenc: partially revert previous commits to set options via a profile
It didn't work out because of the exceptions that needed to be made
for the "-1" cases and was overall more confusing that just manually
checking and setting options for each profile.
Diffstat (limited to 'libavcodec/aacenctab.h')
| -rw-r--r-- | libavcodec/aacenctab.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index c6658a4a6f..5fc9411232 100644 --- a/libavcodec/aacenctab.h +++ b/libavcodec/aacenctab.h @@ -36,13 +36,6 @@ /** Total number of codebooks, including special ones **/ #define CB_TOT_ALL 15 -/** Profile option settings **/ -#define OPT_AUTO -1 -#define OPT_BANNED -256 -#define OPT_NEEDS_LTP -384 -#define OPT_NEEDS_MAIN -512 -#define OPT_REQUIRED -768 - #define AAC_MAX_CHANNELS 8 extern const uint8_t *ff_aac_swb_size_1024[]; @@ -125,4 +118,11 @@ static const unsigned char aac_maxval_cb[] = { 0, 1, 3, 5, 5, 7, 7, 7, 9, 9, 9, 9, 9, 11 }; +static const int aacenc_profiles[] = { + FF_PROFILE_AAC_MAIN, + FF_PROFILE_AAC_LOW, + FF_PROFILE_AAC_LTP, + FF_PROFILE_MPEG2_AAC_LOW, +}; + #endif /* AVCODEC_AACENCTAB_H */ |