shithub: aacdec

Download patch

ref: 44c7b98d129afe60aac5bf8a688902a67623c27f
parent: 4f050e1ad2987d905969e97e9b98790427cad476
author: menno <menno>
date: Wed Aug 7 07:23:43 EDT 2002

Bugfix for non ER compilation

--- a/libfaad/syntax.c
+++ b/libfaad/syntax.c
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: syntax.c,v 1.21 2002/08/05 20:33:38 menno Exp $
+** $Id: syntax.c,v 1.22 2002/08/07 11:23:43 menno Exp $
 **/
 
 /*
@@ -696,18 +696,11 @@
             return result;
     }
 
-    if ((object_type >= ER_OBJECT_START) 
-#ifdef DRM
-        && (object_type != DRM_ER_LC)
-#endif
-        )
+    if (aacSpectralDataResilienceFlag)
     {
         if (ics->tns_data_present)
             tns_data(ics, &(ics->tns), ld);
-    }
 
-    if (aacSpectralDataResilienceFlag)
-    {
         /* error resilient spectral data decoding */
         if ((result = reordered_spectral_data(ics, ld, spec_data, frame_len,
             aacSectionDataResilienceFlag)) > 0)
@@ -715,14 +708,24 @@
             return result;
         }
     } else {
+
+        if ((object_type >= ER_OBJECT_START) 
+#ifdef DRM
+            && (object_type != DRM_ER_LC)
 #endif
+            )
+        {
+            if (ics->tns_data_present)
+                tns_data(ics, &(ics->tns), ld);
+        }
 
-#ifdef ERROR_RESILIENCE
+#endif
         /* decode the spectral data */
         if ((result = spectral_data(ics, ld, spec_data, frame_len)) > 0)
         {
             return result;
         }
+#ifdef ERROR_RESILIENCE
     }
 #endif