Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff' * commit '40d9f0105f0a8f484724619154b18c5d85589eff': Fixed the software AAC encoder
Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff' * commit '40d9f0105f0a8f484724619154b18c5d85589eff': Fixed the software AAC encoder