diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:22:24 +0200 |
| commit | 674216991d409316155695baeb6b69c22c758815 (patch) | |
| tree | 97b390e16c5f2378f193499224a05445d9715bd0 /libavcodec/libfdk-aacenc.c | |
| parent | af285072b5d226bb0032b8576d132d01e2d22fa1 (diff) | |
| parent | 47aed43990e2bf31d0599d5ac862afa5e264a601 (diff) | |
| download | ffmpeg-674216991d409316155695baeb6b69c22c758815.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix APE tag dependencies
MS Expression Encoder Screen decoder
libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 32d91e94a8..80d2652eab 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -230,6 +230,15 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) goto error; } + if (avctx->cutoff > 0) { + if ((err = aacEncoder_SetParam(s->handle, AACENC_BANDWIDTH, + avctx->cutoff)) != AACENC_OK) { + av_log(avctx, AV_LOG_ERROR, "Unable to set the encoder bandwith to %d: %s\n", + avctx->cutoff, aac_get_error(err)); + goto error; + } + } + if ((err = aacEncEncode(s->handle, NULL, NULL, NULL, NULL)) != AACENC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to initialize the encoder: %s\n", aac_get_error(err)); |