diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-14 17:32:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-14 17:32:17 +0100 |
| commit | ee7be955947a0a591f42641419bf4a88953a77fb (patch) | |
| tree | ef422756ae45ec9db4280bb0585f66a7beca72ef /libAACenc/src/aacenc.cpp | |
| parent | 2f29dd48d02d402169246e3c7f9256869817392a (diff) | |
| download | fdk-aac-ee7be955947a0a591f42641419bf4a88953a77fb.tar.gz fdk-aac-ee7be955947a0a591f42641419bf4a88953a77fb.tar.bz2 fdk-aac-ee7be955947a0a591f42641419bf4a88953a77fb.zip | |
Apply piratfm's first commit
It's the patch from commit
e969ea8 AAC960 works now. All modes: LC/SBR/PS. Only for DAB+, not DRM.
without the copyright headers that create a ton of merge conficts
Diffstat (limited to 'libAACenc/src/aacenc.cpp')
| -rw-r--r-- | libAACenc/src/aacenc.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libAACenc/src/aacenc.cpp b/libAACenc/src/aacenc.cpp index 569662b..e0bda19 100644 --- a/libAACenc/src/aacenc.cpp +++ b/libAACenc/src/aacenc.cpp @@ -451,6 +451,7 @@ AAC_ENCODER_ERROR FDKaacEnc_Initialize(HANDLE_AAC_ENC hAacEnc, switch (config->framelength) { case 1024: + case 960: //TODO: DRM if ( config->audioObjectType == AOT_ER_AAC_LD || config->audioObjectType == AOT_ER_AAC_ELD ) { |