commit d67a6aa59c1b94f01fceebc3dbd7624e78829031
author Alex Converse <alex.converse@gmail.com> Sat Jan 22 05:23:43 2011
committer Michael Niedermayer <michaelni@gmx.at> Sun Jan 23 18:32:08 2011
tree ce21f81865eeaada97d8282b72573b183e1c346e
parent e6d4019503645f1a7cf8bf5c06c7cf0d36e924a3

aacenc: mark SBR absent

Use backwards compatible explicit signalling to denote the absence of
SBR.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8ae0fa243e1f7a03cb5f23e2d9a32d3cc88b4def)

libavcodec/aacenc.c

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index c52ffa0..f8f0eb4 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -149,6 +149,11 @@
     put_bits(&pb, 1, 0); //frame length - 1024 samples
     put_bits(&pb, 1, 0); //does not depend on core coder
     put_bits(&pb, 1, 0); //is not extension
+
+    //Explicitly Mark SBR absent
+    put_bits(&pb, 11, 0x27b); //sync extension
+    put_bits(&pb, 5,  AOT_SBR);
+    put_bits(&pb, 1,  0);
     flush_put_bits(&pb);
 }
 
@@ -193,8 +198,8 @@
 
     s->samples            = av_malloc(2 * 1024 * avctx->channels * sizeof(s->samples[0]));
     s->cpe                = av_mallocz(sizeof(ChannelElement) * aac_chan_configs[avctx->channels-1][0]);
-    avctx->extradata      = av_mallocz(2 + FF_INPUT_BUFFER_PADDING_SIZE);
-    avctx->extradata_size = 2;
+    avctx->extradata      = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE);
+    avctx->extradata_size = 5;
     put_audio_specific_config(avctx);
 
     sizes[0]   = swb_size_1024[i];