[Mplayer-cvslog] CVS: main/libfaad2 analysis.h, 1.2, 1.3 bits.c, 1.3, 1.4 bits.h, 1.4, 1.5 cfft.c, 1.3, 1.4 cfft.h, 1.2, 1.3 cfft_tab.h, 1.3, 1.4 common.c, 1.3, 1.4 common.h, 1.4, 1.5 decoder.c, 1.3, 1.4 decoder.h, 1.3, 1.4 drc.c, 1.3, 1.4 drc.h, 1.2, 1

[Diego Biurrun]

Arpi writes:
> 
> >  **
> > +** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30
> >  ** $Id$
> 
> WTF?
> i dont remember doing so.
> i only imported official libfaad2 lib to cvs, did not change it afair.

You made some changes, they were not big, but they exist
nevertheless.  To stop further arguments I've made a diff:

--- /tmp/faad/libfaad/common.h	2003-07-29 10:20:12.000000000 +0200
+++ libfaad2/common.h	2003-08-31 00:30:21.000000000 +0200
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense at nero.com.
 **
-** $Id: common.h,v 1.30 2003/07/29 08:20:12 menno Exp $
+** $Id: common.h,v 1.1 2003/08/30 22:30:21 arpi Exp $
 **/
 
 #ifndef __COMMON_H__
@@ -32,6 +32,8 @@
 extern "C" {
 #endif
 
+#  include "../config.h"
+
 #define INLINE __inline
 
 #ifndef max
@@ -121,9 +123,25 @@
 
 #else
 
-#ifdef HAVE_CONFIG_H
-#  include "../config.h"
-#endif
+/* Define if needed */
+/* #undef HAVE_FLOAT32_T */
+
+/* Define if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+
 
 #include <stdio.h>
 #if HAVE_SYS_TYPES_H
Only in libfaad2/: config.h
Only in /tmp/faad/libfaad/: libfaad2.def
Only in /tmp/faad/libfaad/: libfaad2_dll.dsp
Only in /tmp/faad/libfaad/: libfaad2_dll.dsw
Only in /tmp/faad/libfaad/: libfaad2_dll.sln
Only in /tmp/faad/libfaad/: libfaad2_dll.vcproj
Only in /tmp/faad/libfaad/: libfaad2.vcp
Only in /tmp/faad/libfaad/: libfaad2.vcw
Only in /tmp/faad/libfaad/: libfaad.dsp
Only in /tmp/faad/libfaad/: libfaad.dsw
Only in /tmp/faad/libfaad/: libfaad.sln
Only in /tmp/faad/libfaad/: libfaad.vcproj
Only in libfaad2/: Makefile
Only in /tmp/faad/libfaad/: Makefile.am
--- /tmp/faad/libfaad/sbr_huff.h	2003-07-29 10:20:13.000000000 +0200
+++ libfaad2/sbr_huff.h	2003-08-31 00:30:22.000000000 +0200
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense at nero.com.
 **
-** $Id: sbr_huff.h,v 1.5 2003/07/29 08:20:13 menno Exp $
+** $Id: sbr_huff.h,v 1.1 2003/08/30 22:30:22 arpi Exp $
 **/
 
 #ifndef __SBR_HUFF_H__
@@ -36,16 +36,16 @@
 
 int16_t sbr_huff_dec(bitfile *ld, sbr_huff_tab t_huff);
 
-const int8_t t_huffman_env_1_5dB[][2];
-const int8_t f_huffman_env_1_5dB[][2];
-const int8_t t_huffman_env_bal_1_5dB[][2];
-const int8_t f_huffman_env_bal_1_5dB[][2];
-const int8_t t_huffman_env_3_0dB[][2];
-const int8_t f_huffman_env_3_0dB[][2];
-const int8_t t_huffman_env_bal_3_0dB[][2];
-const int8_t f_huffman_env_bal_3_0dB[][2];
-const int8_t t_huffman_noise_3_0dB[][2];
-const int8_t t_huffman_noise_bal_3_0dB[][2];
+const int8_t t_huffman_env_1_5dB[120][2];
+const int8_t f_huffman_env_1_5dB[120][2];
+const int8_t t_huffman_env_bal_1_5dB[48][2];
+const int8_t f_huffman_env_bal_1_5dB[48][2];
+const int8_t t_huffman_env_3_0dB[62][2];
+const int8_t f_huffman_env_3_0dB[62][2];
+const int8_t t_huffman_env_bal_3_0dB[24][2];
+const int8_t f_huffman_env_bal_3_0dB[24][2];
+const int8_t t_huffman_noise_3_0dB[62][2];
+const int8_t t_huffman_noise_bal_3_0dB[24][2];
 
 #ifdef __cplusplus
 }


> and adding such gpl nonsence is useless.

Different people seem to have different opinions on this subject.  If
you have an idea how to do it better technically, I would be delighted
to hear it.  I fail to see how such a blanket statement could hurt,
though.  I completely understand that you cannot be bothered to
include such a notice, but I do not understand why you object to
somebody else doing it (for you).

For reference, here is the relevant portion of the GPL:

    2. You may modify your copy or copies of the Program or any
  portion of it, thus forming a work based on the Program, and copy
  and distribute such modifications or work under the terms of Section
  1 above, provided that you also meet all of these conditions:

      a) You must cause the modified files to carry prominent notices
      stating that you changed the files and the date of any change.

Regards

Diego