diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:57:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:57:04 +0200 |
| commit | af5f9c08763baff271401cf7f7478bae4d5db8dc (patch) | |
| tree | 1d62c75c69c64ce230b308073112c7beb4595b97 /libavcodec/libfdk-aacenc.c | |
| parent | 14a61bc3f9ad68151368bc3577bb26fe1146fbf4 (diff) | |
| parent | 95d52464542f532061290192518d5fe1c1930e8d (diff) | |
| download | ffmpeg-af5f9c08763baff271401cf7f7478bae4d5db8dc.tar.gz | |
Merge commit '95d52464542f532061290192518d5fe1c1930e8d'
* commit '95d52464542f532061290192518d5fe1c1930e8d':
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index e3992e1dbe..034701a45d 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -197,6 +197,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) avctx->bit_rate = (96*sce + 128*cpe) * avctx->sample_rate / 44; if (avctx->profile == FF_PROFILE_AAC_HE || avctx->profile == FF_PROFILE_AAC_HE_V2 || + avctx->profile == FF_PROFILE_MPEG2_AAC_HE || s->eld_sbr) avctx->bit_rate /= 2; } |