[SCM] libav/experimental: Add support for non-backwards compatible signaled parametric stereo.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1e79771c310e3b22984f1cc989afd4434bfcc2c4
Author: Alex Converse <alex.converse at gmail.com>
Date:   Sun Mar 7 17:55:23 2010 +0000

    Add support for non-backwards compatible signaled parametric stereo.
    
    This is done without breaking W6132 Annex YYYY draft MP3onMP4 which also uses AOT 29.
    Samples:
    http://samples.mplayerhq.hu/A-codecs/AAC/aacPlusDecoderCheckPackage_v2.1/bitstreams/File7.3gp
    http://samples.mplayerhq.hu/MPEG-4/mp3on4/id5_1.mp4
    
    Originally committed as revision 22281 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 7fe25bd..0666bbb 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -88,7 +88,9 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
     if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
         c->channels = ff_mpeg4audio_channels[c->chan_config];
     c->sbr = -1;
-    if (c->object_type == AOT_SBR) {
+    if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&
+        // check for W6132 Annex YYYY draft MP3onMP4
+        !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) {
         c->ext_object_type = c->object_type;
         c->sbr = 1;
         c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);

-- 
Libav/FFmpeg packaging