[FFmpeg-soc] [soc]: r5449 - aac-sbr/aacsbr.c

alexc subversion at mplayerhq.hu
Wed Nov 18 13:08:22 CET 2009


Author: alexc
Date: Wed Nov 18 13:08:22 2009
New Revision: 5449

Log:
nrLim is the last element in limTable not the number of elements.

Modified:
   aac-sbr/aacsbr.c

Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c	Wed Nov 18 13:08:19 2009	(r5448)
+++ aac-sbr/aacsbr.c	Wed Nov 18 13:08:22 2009	(r5449)
@@ -390,18 +390,18 @@ static int sbr_hf_calc_npatches(AACConte
     return 0;
 }
 
-static inline void remove_table_element(void *table, uint8_t *nel, int el_size,
+static inline void remove_table_element(void *table, uint8_t *last_el, int el_size,
                                         int el)
 {
-    memmove((uint8_t *)table + el_size*el, (uint8_t *)table + el_size*(el + 1), (*nel - el - 1)*el_size);
-    (*nel)--;
+    memmove((uint8_t *)table + el_size*el, (uint8_t *)table + el_size*(el + 1), (*last_el - el)*el_size);
+    (*last_el)--;
 }
 
-static inline int in_table(void *table, int nel, int el_size, void *needle)
+static inline int in_table(void *table, int last_el, int el_size, void *needle)
 {
     int i;
     uint8_t *table_ptr = table; // avoids a warning with void * ptr arith
-    for (i = 0; i < nel; i++, table_ptr += el_size)
+    for (i = 0; i <= last_el; i++, table_ptr += el_size)
         if (!memcmp(table_ptr, needle, el_size))
             return 1;
     return 0;


More information about the FFmpeg-soc mailing list