summaryrefslogtreecommitdiff
path: root/ffmpeg/libavcodec/libfdk-aacenc.c
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
committerTim Redfern <tim@eclectronics.org>2013-12-29 12:19:38 +0000
commitf7813a5324be39d13ab536c245d15dfc602a7849 (patch)
treefad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/libfdk-aacenc.c
parentb7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff)
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/libfdk-aacenc.c')
-rw-r--r--ffmpeg/libavcodec/libfdk-aacenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg/libavcodec/libfdk-aacenc.c b/ffmpeg/libavcodec/libfdk-aacenc.c
index e3992e1..755b76f 100644
--- a/ffmpeg/libavcodec/libfdk-aacenc.c
+++ b/ffmpeg/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;
}
@@ -393,6 +394,7 @@ static const int aac_sample_rates[] = {
AVCodec ff_libfdk_aac_encoder = {
.name = "libfdk_aac",
+ .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_AAC,
.priv_data_size = sizeof(AACContext),
@@ -402,7 +404,6 @@ AVCodec ff_libfdk_aac_encoder = {
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
- .long_name = NULL_IF_CONFIG_SMALL("Fraunhofer FDK AAC"),
.priv_class = &aac_enc_class,
.defaults = aac_encode_defaults,
.profiles = profiles,