diff options
| author | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
| commit | 288639e626b5c550fdd33e49abf1b8e3a3fcd52e (patch) | |
| tree | 0df5c1da8728a0706110984b675a0d3b7a350ba9 /libhb/muxmkv.c | |
| parent | b56a9d0fc23ca64f1d63afb797bdc07e1dffc357 (diff) | |
Add optional fdk-aac encoder
configure --enable-fdk-aac to enable this encoder
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5287 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxmkv.c')
| -rw-r--r-- | libhb/muxmkv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index e45ebb126..fe50a6415 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -260,6 +260,8 @@ static int MKVInit( hb_mux_object_t * m ) case HB_ACODEC_FFAAC: case HB_ACODEC_CA_AAC: case HB_ACODEC_CA_HAAC: + case HB_ACODEC_FDK_AAC: + case HB_ACODEC_FDK_HAAC: track->codecPrivate = audio->priv.config.extradata.bytes; track->codecPrivateSize = audio->priv.config.extradata.length; track->codecID = MK_ACODEC_AAC; @@ -285,7 +287,8 @@ static int MKVInit( hb_mux_object_t * m ) lang = lang_for_code2( audio->config.lang.iso639_2 ); track->language = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2; // sample rate - if ((audio->config.out.codec == HB_ACODEC_CA_HAAC) || + if ((audio->config.out.codec == HB_ACODEC_CA_HAAC) || + (audio->config.out.codec == HB_ACODEC_FDK_HAAC) || (audio->config.out.codec == HB_ACODEC_AAC_PASS && audio->config.in.samples_per_frame > 1024)) { |