Update of /cvsroot/faac/faac/frontend
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16734/frontend
Modified Files:
Makefile.am main.c
Log Message:
FAAC now able to use external updated libmp4v2
Index: Makefile.am
===================================================================
RCS file: /cvsroot/faac/faac/frontend/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.am 16 Dec 2008 00:56:00 -0000 1.9
--- Makefile.am 27 Jul 2009 18:12:38 -0000 1.10
***************
*** 9,12 ****
--- 9,16 ----
else
INCLUDES = -I$(top_srcdir)/include
+ if WITH_EXTERNAL_MP4V2
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
+ else
LDADD = $(top_builddir)/libfaac/libfaac.la -lm
endif
+ endif
Index: main.c
===================================================================
RCS file: /cvsroot/faac/faac/frontend/main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** main.c 24 Jan 2009 01:10:20 -0000 1.82
--- main.c 27 Jul 2009 18:12:38 -0000 1.83
***************
*** 30,34 ****
#endif
! #ifdef HAVE_LIBMP4V2
# include <mp4.h>
#endif
--- 30,37 ----
#endif
! #ifdef HAVE_EXTERNAL_LIBMP4V2
! # include <mp4v2/mp4v2.h>
! # define HAVE_LIBMP4V2
! #elif defined(HAVE_LIBMP4V2)
# include <mp4.h>
#endif
***************
*** 1168,1171 ****
--- 1171,1177 ----
/*
$Log$
+ Revision 1.83 2009/07/27 18:12:38 menno
+ FAAC now able to use external updated libmp4v2
+
Revision 1.82 2009/01/24 01:10:20 menno
Made JPEG detection less restrictive
|