[Mplayer-cvslog] CVS: main/libac3 bit_allocate.c,1.2,1.3 bit_allocate.h,1.1.1.1,1.2 bitstream.c,1.2,1.3 bitstream.h,1.2,1.3 decode.c,1.8,1.9 imdct.c,1.9,1.10 imdct.h,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libac3
In directory mplayer:/var/tmp.root/cvs-serv23217

Modified Files:
	bit_allocate.c bit_allocate.h bitstream.c bitstream.h decode.c 
	imdct.c imdct.h 
Log Message:
few symbols renamed to avoid conflicts with liba52

Index: bit_allocate.c
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/bit_allocate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bit_allocate.c	16 Nov 2001 18:05:39 -0000	1.2
+++ bit_allocate.c	9 Dec 2001 17:47:55 -0000	1.3
@@ -203,7 +203,7 @@
  *
  **/
 
-void bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk)
+void ac3_bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk)
 {
 	uint16_t i;
 	int16_t fgain;

Index: bit_allocate.h
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/bit_allocate.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bit_allocate.h	24 Feb 2001 20:29:35 -0000	1.1.1.1
+++ bit_allocate.h	9 Dec 2001 17:47:55 -0000	1.2
@@ -21,4 +21,4 @@
  *
  */
 
-void bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk);
+void ac3_bit_allocate(uint16_t fscod, bsi_t *bsi, audblk_t *audblk);

Index: bitstream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/bitstream.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bitstream.c	12 Jul 2001 15:35:51 -0000	1.2
+++ bitstream.c	9 Dec 2001 17:47:55 -0000	1.3
@@ -70,7 +70,7 @@
  * -ah
  **/
 
-uint32_t bitstream_get_bh (uint32_t num_bits)
+uint32_t ac3_bitstream_get_bh (uint32_t num_bits)
 {
 	uint32_t result;
 
@@ -92,7 +92,7 @@
  *
  **/
 
-void bitstream_init (uint8_t *start)
+void ac3_bitstream_init (uint8_t *start)
 {
 	//initialize the start of the buffer
 	buffer_start = start;

Index: bitstream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/bitstream.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bitstream.h	12 Jul 2001 15:35:51 -0000	1.2
+++ bitstream.h	9 Dec 2001 17:47:55 -0000	1.3
@@ -37,10 +37,10 @@
 #endif
 
 
-void bitstream_init(uint8_t *start);
+void ac3_bitstream_init(uint8_t *start);
 void bitstream_byte_align(void);
 inline uint32_t bitstream_show_bh(uint32_t num_bits);
-inline uint32_t bitstream_get_bh(uint32_t num_bits);
+inline uint32_t ac3_bitstream_get_bh(uint32_t num_bits);
 inline void bitstream_flush_bh(uint32_t num_bits);
 
 
@@ -54,7 +54,7 @@
 		return result;
 	}
 
-	return bitstream_get_bh (num_bits);
+	return ac3_bitstream_get_bh (num_bits);
 }
 
 

Index: decode.c
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/decode.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- decode.c	28 Nov 2001 12:48:36 -0000	1.8
+++ decode.c	9 Dec 2001 17:47:55 -0000	1.9
@@ -143,7 +143,7 @@
 	//if we got to this point, we found a valid ac3 frame to decode
 	//
 
-	bitstream_init (buffer);
+	ac3_bitstream_init (buffer);
 	//get rid of the syncinfo struct as we already parsed it
 	bitstream_get (24);
         
@@ -166,7 +166,7 @@
 	ac3_config.num_output_ch = 2;
 	ac3_config.flags = 0;
 #endif
-	imdct_init();
+	ac3_imdct_init();
 	memset (&syncinfo, 0, sizeof (syncinfo));
 	memset (&bsi, 0, sizeof (bsi));
 	memset (&audblk, 0, sizeof (audblk));
@@ -233,7 +233,7 @@
 			if(error_flag) return NULL;
 
 			// Figure out how many bits per mantissa 
-			bit_allocate(syncinfo.fscod,&bsi,&audblk);
+			ac3_bit_allocate(syncinfo.fscod,&bsi,&audblk);
 
 			// Extract the mantissas from the stream and
 			// generate floating point frequency coefficients
@@ -245,7 +245,7 @@
 
 			// Convert the frequency samples into time samples 
 			// Downmix at the same time...
-			imdct (&bsi,&audblk,samples,
+			ac3_imdct (&bsi,&audblk,samples,
 			       ac3_config.num_output_ch,
 			       &s16_samples[i*ac3_config.num_output_ch*256],
 			       &dm_par);

Index: imdct.c
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/imdct.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- imdct.c	28 Nov 2001 12:46:22 -0000	1.9
+++ imdct.c	9 Dec 2001 17:47:55 -0000	1.10
@@ -128,7 +128,7 @@
  *
  **/
 #ifndef HAVE_SSE
-void imdct_init(void)
+void ac3_imdct_init(void)
  {
 	int i;
 	float scale = 255.99609372;
@@ -533,7 +533,7 @@
   }
 }
 
-void imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples,
+void ac3_imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples,
 	    int num_output_channels, int16_t *s16_samples, dm_par_t* dm_par)
 {
 	int i;

Index: imdct.h
===================================================================
RCS file: /cvsroot/mplayer/main/libac3/imdct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imdct.h	28 Nov 2001 12:46:22 -0000	1.2
+++ imdct.h	9 Dec 2001 17:47:55 -0000	1.3
@@ -22,5 +22,5 @@
  *
  */
 
-void imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples, int num_output_channels, int16_t *s16_samples, dm_par_t *dm_par);
-void imdct_init(void);
+void ac3_imdct (bsi_t *bsi,audblk_t *audblk, stream_samples_t samples, int num_output_channels, int16_t *s16_samples, dm_par_t *dm_par);
+void ac3_imdct_init(void);