[vlc-commits] Revert "Fix AAC encoding with ffaac"

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Apr 20 12:27:28 2012 -0400| [59f8ed0cd3bbe0b36edb3955f60b05377a3dd39f] | committer: Rafaël Carré

Revert "Fix AAC encoding with ffaac"

This reverts commit 8585706f5060212845c00ab9bca43c4a3ea17ec0.

Don't silently enable experimental features

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59f8ed0cd3bbe0b36edb3955f60b05377a3dd39f
---

 modules/codec/avcodec/encoder.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index aaf1481..a96955e 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -383,8 +383,6 @@ int OpenEncoder( vlc_object_t *p_this )
     p_sys->b_trellis = var_GetBool( p_enc, ENC_CFG_PREFIX "trellis" );
 
     p_context->strict_std_compliance = var_GetInteger( p_enc, ENC_CFG_PREFIX "strict" );
-    if( i_codec_id == CODEC_ID_AAC )
-        p_context->strict_std_compliance = -2;
 
     p_sys->f_lumi_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "lumi-masking" );
     p_sys->f_dark_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "dark-masking" );