~ft/aacdec

ee772c4bc50a9ff0743198825a5dca9b0038c056 — menno 15 years ago 0620c36
Compilation fixes for linux
Bugfix in ps_syntax.c bitstream reading for PS
4 files changed, 13 insertions(+), 10 deletions(-)

M configure.in
M include/neaacdec.h
M libfaad/ps_syntax.c
M plugins/Makefile.am
M configure.in => configure.in +4 -1
@@ 9,7 9,7 @@ dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)

AC_INIT
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(faad2, 2.5.0)
AM_INIT_AUTOMAKE(faad2, 2.6.0cvs)

AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)


@@ 118,6 118,9 @@ if test x$WITHBMP = xyes; then
  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
  AM_CONDITIONAL([HAVE_XMMS], true)
  AM_CONDITIONAL([HAVE_BMP], true)
else
 AC_MSG_NOTICE(no beepmp build configured)
 AM_CONDITIONAL(HAVE_BMP, false)
fi

if test x$WITHDRM = xyes; then

M include/neaacdec.h => include/neaacdec.h +2 -2
@@ 27,7 27,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
**
** $Id: neaacdec.h,v 1.8 2006/08/13 14:13:31 menno Exp $
** $Id: neaacdec.h,v 1.9 2006/08/15 19:05:11 menno Exp $
**/

#ifndef __NEAACDEC_H__


@@ 71,7 71,7 @@ extern "C" {
  #endif
#endif

#define FAAD2_VERSION "2.5"
#define FAAD2_VERSION "2.6 beta"

/* object types for AAC */
#define MAIN       1

M libfaad/ps_syntax.c => libfaad/ps_syntax.c +6 -6
@@ 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: ps_syntax.c,v 1.8 2006/05/07 18:09:01 menno Exp $
** $Id: ps_syntax.c,v 1.9 2006/08/15 19:05:11 menno Exp $
**/

#include "common.h"


@@ 402,7 402,7 @@ uint16_t ps_data(ps_info *ps, bitfile *ld, uint8_t *header)
        for (n = 1; n < ps->num_env+1; n++)
        {
            ps->border_position[n] = (uint8_t)faad_getbits(ld, 5
                DEBUGVAR(1,1008,"ps_data(): border_position"));
                DEBUGVAR(1,1008,"ps_data(): border_position")) + 1;
        }
    }


M plugins/Makefile.am => plugins/Makefile.am +1 -1
@@ 9,7 9,7 @@ if HAVE_XMMS
SUBDIRS = xmms
else
if HAVE_BMP
SUBDIRS = bmp
SUBDIRS = xmms
else
SUBDIRS =
endif #HAVE_BMP