ref: 317eea7009602d6c673013dda3944ca8f5e73c60
parent: d287c89fb9c38de28d4c531208dbf835388b921f
author: oxygene2000 <oxygene2000>
date: Wed Apr 5 16:13:16 EDT 2000
- Made it compile with gcc/linux again
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
DESTDIR =
-SOURCE=aac_qc.c aac_se_enc.c bitstream.c enc_tf.c encoder.c is.c mc_enc.c ms.c psych.c pulse.c tns.c transfo.c fastfft.c nok_ltp_enc.c nok_pitch.c rateconv.c faac.c
+SOURCE=aac_se_enc.c bitstream.c enc_tf.c encoder.c is.c mc_enc.c ms.c psych.c pulse.c tns.c transfo.c fastfft.c nok_ltp_enc.c nok_pitch.c rateconv.c faac.c quant.c huffman.c
OBJ = $(SOURCE:.c=.o)
--- a/huffman.h
+++ b/huffman.h
@@ -54,6 +54,9 @@
/*********************************************************/
/* output_bits */
/*********************************************************/
+#ifndef __BORLANDC__
+__inline
+#endif
int output_bits(AACQuantInfo* quantInfo,
/*int huff[13][MAXINDEX][NUMINTAB],*/
int book, /* codebook */
--- a/psych.h
+++ b/psych.h
@@ -312,11 +312,11 @@
void psy_step12(
PARTITION_TABLE_LONG *part_tbl_long,
-// PARTITION_TABLE_SHORT *part_tbl_short,
+ PARTITION_TABLE_SHORT *part_tbl_short,
PSY_STATVARIABLE_LONG *psy_stvar_long,
-// PSY_STATVARIABLE_SHORT *psy_stvar_short,
+ PSY_STATVARIABLE_SHORT *psy_stvar_short,
PSY_VARIABLE_LONG *psy_var_long
-// ,PSY_VARIABLE_SHORT *psy_var_short
+ ,PSY_VARIABLE_SHORT *psy_var_short
// ,int ch
);