ref: 5ad0c0afd4c11aea61e4fb981eca7ebb496929d5
parent: e879a90e5469b503113ae27a84999c403f4f17d8
author: menno <menno>
date: Wed May 17 14:49:21 EDT 2006
Latest patches
--- a/common/mp4ff/mp4ff.h
+++ b/common/mp4ff/mp4ff.h
@@ -27,7 +27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: mp4ff.h,v 1.23 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4ff.h,v 1.24 2006/05/17 18:49:20 menno Exp $
**/
#ifndef MP4FF_H
@@ -133,4 +133,4 @@
}
#endif /* __cplusplus */
-#endif
\ No newline at end of file
+#endif
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@
AC_INIT
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(faad2, 2.0)
+AM_INIT_AUTOMAKE(faad2, 2.0.1cvs20060515)
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
@@ -59,7 +59,7 @@
AC_TYPE_OFF_T
-AC_DEFUN(MY_CHECK_TYPEDEF_FROM_INCLUDE,
+AC_DEFUN([MY_CHECK_TYPEDEF_FROM_INCLUDE],
[
AC_MSG_CHECKING([for $1])
AC_TRY_COMPILE([$2],
--- a/faad2.spec.in
+++ b/faad2.spec.in
@@ -1,3 +1,9 @@
+# option to compile without XMMS plugin
+%if %{?without_xmms:1}%{!?without_xmms:0}+ %define _without_xmms --without-xmms
+%else
+ %define _with_xmms --with-xmms
+%endif
# this has been taken from http://www.hyperborea.org/software/dillo/dillo.spec
#################################################################################
# Identify which distribution we're building on.
@@ -25,9 +31,14 @@
Source0: http://download.sourceforge.net/faad/%{name}-%{version}.tar.gz #Patch: faad2-%{version}.patchBuildRequires: autoconf, automake, libtool, gcc-c++
-BuildRequires: xmms-devel, id3lib-devel
+
+%if %{?_with_xmms:1}%{!?_with_xmms:0}+BuildRequires: xmms-devel
+%endif
+
URL: http://www.audiocoding.com/
#################################################################################
+%if %{?_with_xmms:1}%{!?_with_xmms:0}# GTK Dependencies
%if %{mdk}BuildRequires: libgtk+-devel >= 1.2.0
@@ -38,6 +49,7 @@
%if !%{suse} && !%{mdk}BuildRequires: gtk+-devel >= 1.2.0
%endif
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootPackager: a.kurpiers@nt.tu-darmstadt.de
@@ -57,10 +69,11 @@
%description devel
Header files and development documentation for libfaad.
+%if %{?_with_xmms:1}%{!?_with_xmms:0}%package xmms
Group: Applications/Multimedia
Summary: AAC and MP4 input plugin for xmms
-Requires: %{name}, %{name}-libmp4v2, xmms, id3lib+Requires: %{name}, xmms%description xmms
@@ -69,8 +82,8 @@
This MP4 xmms plugin reads AAC files with and without ID3 tags (version 2.x).
AAC files are MPEG2 or MPEG4 files that can be found in MPEG4 audio files
(.mp4). MPEG4 files with AAC inside can be read by RealPlayer or Quicktime.
+%endif
-
%prep
#%setup -n %{name} %setup -n %{name}-%{version}@@ -78,7 +91,7 @@
%build
#sh bootstrap
-./configure --with-drm --with-xmms --prefix=/usr
+./configure --with-drm %{?_with_xmms} %{?_without_xmms} --prefix=/usrmake
%install
@@ -85,6 +98,9 @@
rm -rf %{buildroot}# Hack to work around a problem with DESTDIR in libtool 1.4.x
LIBRARY_PATH="%{buildroot}/usr/lib:${LIBRARY_PATH}" make install DESTDIR=%{buildroot}+# install libmp4ff
+install -m 755 common/mp4ff/libmp4ff.a %{buildroot}%{_libdir}+install common/mp4ff/mp4ff.h %{buildroot}%{_includedir}%post -p /sbin/ldconfig
@@ -105,13 +121,30 @@
%{_libdir}/libfaad.la %{_includedir}/faad.h %{_includedir}/neaacdec.h+%{_includedir}/mp4ff.h+%{_libdir}/libmp4ff.a+%if %{?_with_xmms:1}%{!?_with_xmms:0}%files xmms
%defattr(-,root,root)
%doc plugins/xmms/README
%_libdir/xmms/Input/*
+%endif
%changelog
+* Tue Jan 24 2006 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
+- fix wrong function declaration in mp4ffint.h
+
+* Wed Nov 15 2005 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
+- fix requirements for xmms plugin
+- add libmp4ff to devel package (only static library)
+
+* Sat Aug 13 2005 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
+- fix dependencies for xmms plugin. libmp4v2/id3lib no longer needed
+
+* Sun Apr 24 2005 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
+- make xmms plugin generation optional. Build with '--define "without_xmms 1"'
+
* Tue Nov 02 2004 Alexander Kurpiers <a.kurpiers@nt.tu-darmstadt.de>
- remove libmp4ff and libmp4v2 from RPM
- changes for new version of faad2
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**
+**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version.
-**
+**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
+** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
@@ -27,7 +27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: main.c,v 1.78 2006/05/07 18:09:00 menno Exp $
+** $Id: main.c,v 1.79 2006/05/17 18:49:21 menno Exp $
**/
#ifdef _WIN32
@@ -66,7 +66,7 @@
if (!quiet)
{va_start(ap, fmt);
-
+
vfprintf(stream, fmt, ap);
va_end(ap);
--- a/libfaad/ic_predict.c
+++ b/libfaad/ic_predict.c
@@ -27,7 +27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: ic_predict.c,v 1.25 2006/05/07 18:09:00 menno Exp $
+** $Id: ic_predict.c,v 1.26 2006/05/17 18:49:21 menno Exp $
**/
#include "common.h"
@@ -86,7 +86,8 @@
{uint16_t tmp;
int16_t i, j;
- real_t dr1, predictedvalue;
+ real_t dr1;
+ float32_t predictedvalue;
real_t e0, e1;
real_t k1, k2;
@@ -119,7 +120,7 @@
#define B 0.953125
real_t c = COR[0];
real_t v = VAR[0];
- real_t tmp;
+ float32_t tmp;
if (c == 0 || v <= 1)
{k1 = 0;
@@ -149,7 +150,7 @@
#define B 0.953125
real_t c = COR[1];
real_t v = VAR[1];
- real_t tmp;
+ float32_t tmp;
if (c == 0 || v <= 1)
{k2 = 0;
--- a/libfaad/ps_tables.h
+++ b/libfaad/ps_tables.h
@@ -27,7 +27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: ps_tables.h,v 1.5 2006/05/07 18:09:01 menno Exp $
+** $Id: ps_tables.h,v 1.6 2006/05/17 18:49:21 menno Exp $
**/
#ifndef __PS_TABLES_H__
@@ -546,7 +546,7 @@
};
#ifdef __cplusplus
-
+}
#endif
#endif
--- a/libfaad/syntax.c
+++ b/libfaad/syntax.c
@@ -27,7 +27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: syntax.c,v 1.84 2006/05/07 18:09:03 menno Exp $
+** $Id: syntax.c,v 1.85 2006/05/17 18:49:21 menno Exp $
**/
/*
@@ -1364,7 +1364,7 @@
faad_getbits(&ld_sbr, 8); /* Skip 8-bit CRC */
- hDecoder->sbr[0]->ret = sbr_extension_data(&ld_sbr, hDecoder->sbr[0], count);
+ hDecoder->sbr[0]->ret = sbr_extension_data(&ld_sbr, hDecoder->sbr[0], count, hDecoder->postSeekResetFlag);
#if (defined(PS_DEC) || defined(DRM_PS))
if (hDecoder->sbr[0]->ps_used)
{--- a/libfaad/tns.c
+++ b/libfaad/tns.c
@@ -27,7 +27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
-** $Id: tns.c,v 1.37 2006/05/07 18:09:03 menno Exp $
+** $Id: tns.c,v 1.38 2006/05/17 18:49:21 menno Exp $
**/
#include "common.h"
@@ -297,7 +297,7 @@
y = *spectrum;
for (j = 0; j < order; j++)
- y += MUL_C(state[j], lpc[j+1]);
+ y += MUL_C(state[state_index+j], lpc[j+1]);
/* double ringbuffer state */
state_index--;
--
⑨