[FFmpeg-cvslog] r22816 - trunk/libavcodec/mpeg4audio.c

[alexc]

Author: alexc
Date: Thu Apr  8 08:04:31 2010
New Revision: 22816

Log:
Fix ext_object_type.

In the case of explicit non-backwards compible PS, the extension object
type should be set to SBR. See 14496-3:2009 (fourth edition).

Modified:
   trunk/libavcodec/mpeg4audio.c

Modified: trunk/libavcodec/mpeg4audio.c
==============================================================================
--- trunk/libavcodec/mpeg4audio.c	Wed Apr  7 22:06:02 2010	(r22815)
+++ trunk/libavcodec/mpeg4audio.c	Thu Apr  8 08:04:31 2010	(r22816)
@@ -91,7 +91,7 @@ int ff_mpeg4audio_get_config(MPEG4AudioC
     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->ext_object_type = AOT_SBR;
         c->sbr = 1;
         c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
         c->object_type = get_object_type(&gb);