ref: f33c4f4c24125caa86b0a3e446017b67ee85f6ef
parent: 9fb151c0a1fbf4c956982ec1b93d59c36681f49f
author: menno <menno>
date: Thu Feb 13 08:02:27 EST 2003
Small makefile changes
--- a/frontend/Makefile.am
+++ b/frontend/Makefile.am
@@ -2,6 +2,8 @@
faad_SOURCES = main.c audio.c
-CFLAGS = -O2
+AM_CFLAGS = -O2
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
LDADD = $(top_builddir)/libfaad/libfaad.la $(top_builddir)/common/mp4v2/libmp4v2.la -lm
+
+AM_CCLD = $(CXX)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: main.c,v 1.27 2003/02/09 20:42:47 menno Exp $
+** $Id: main.c,v 1.28 2003/02/13 13:02:27 menno Exp $
**/
#ifdef _WIN32
@@ -293,7 +293,8 @@
int GetAACTrack(MP4FileHandle infile)
{
/* find AAC track */
- int i, rc;
+ unsigned short i;
+ int rc;
int numTracks = MP4GetNumberOfTracks(infile, NULL, /* subType */ 0);
for (i = 0; i < numTracks; i++)
--- a/libfaad/Makefile.am
+++ b/libfaad/Makefile.am
@@ -18,4 +18,4 @@
ssr_win.h specrec.h syntax.h tns.h codebook/hcb.h
-CFLAGS = -O2
+AM_CFLAGS = -O2