ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/mpeg4audio.c

 /*
  * MPEG-4 Audio common code
  * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@free.fr>
  * Copyright (c) 2009 Alex Converse <alex.converse@gmail.com>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 70 matching lines @@
     GetBitContext gb;
     int specific_config_bitindex;
 
     init_get_bits(&gb, buf, buf_size*8);
     c->object_type = get_object_type(&gb);
     c->sample_rate = get_sample_rate(&gb, &c->sampling_index);
     c->chan_config = get_bits(&gb, 4);
     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);
         c->object_type = get_object_type(&gb);
         if (c->object_type == AOT_ER_BSAC)
             c->ext_chan_config = get_bits(&gb, 4);
     } else {
         c->ext_object_type = AOT_NULL;
         c->ext_sample_rate = 0;
     }
@@ skipping 58 matching lines @@
     if (bits)
         copy_bits(pb, gb, bits);
     align_put_bits(pb);
     align_get_bits(gb);
     comment_size = copy_bits(pb, gb, 8);
     for (; comment_size > 0; comment_size--)
         copy_bits(pb, gb, 8);
 
     return put_bits_count(pb) - offset;
 }