diff options
| author | Martin Storsjo <martin@martin.st> | 2017-03-14 14:37:45 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2017-03-14 14:37:45 +0200 |
| commit | 32c712cbd10975888a6e0bd117387a2c65e5a23c (patch) | |
| tree | a5af2a7e499d5022a16f959c70f1f21f2ca6fae1 /libAACenc | |
| parent | 74c1a2a4f831285cbd93ec1427f1670d3c5c5e52 (diff) | |
| parent | b0af861f5a0671d1bb65339fdb674cca15090b71 (diff) | |
| download | fdk-aac-32c712cbd10975888a6e0bd117387a2c65e5a23c.tar.gz fdk-aac-32c712cbd10975888a6e0bd117387a2c65e5a23c.tar.bz2 fdk-aac-32c712cbd10975888a6e0bd117387a2c65e5a23c.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACenc')
| -rw-r--r-- | libAACenc/src/metadata_main.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libAACenc/src/metadata_main.cpp b/libAACenc/src/metadata_main.cpp index e920793..90f8f4e 100644 --- a/libAACenc/src/metadata_main.cpp +++ b/libAACenc/src/metadata_main.cpp @@ -488,14 +488,12 @@ static FDK_METADATA_ERROR ProcessCompressor( { FDK_METADATA_ERROR err = METADATA_OK; - INT dynrng, compr; - DRC_PROFILE profileDrc = convertProfile(pMetadata->mpegDrc.drc_profile); - DRC_PROFILE profileComp = convertProfile(pMetadata->etsiAncData.comp_profile); - if ( (pMetadata==NULL) || (hDrcComp==NULL) ) { err = METADATA_INVALID_HANDLE; return err; } + DRC_PROFILE profileDrc = convertProfile(pMetadata->mpegDrc.drc_profile); + DRC_PROFILE profileComp = convertProfile(pMetadata->etsiAncData.comp_profile); /* first, check if profile is same as last frame * otherwise, update setup */ @@ -511,8 +509,8 @@ static FDK_METADATA_ERROR ProcessCompressor( } /* in case of embedding external values, copy this now (limiter may overwrite them) */ - dynrng = decodeDynrng(pMetadata->mpegDrc.dyn_rng_ctl[0], pMetadata->mpegDrc.dyn_rng_sgn[0]); - compr = decodeCompr(pMetadata->etsiAncData.compression_value); + INT dynrng = decodeDynrng(pMetadata->mpegDrc.dyn_rng_ctl[0], pMetadata->mpegDrc.dyn_rng_sgn[0]); + INT compr = decodeCompr(pMetadata->etsiAncData.compression_value); /* Call compressor */ if (FDK_DRC_Generator_Calc(hDrcComp, |