configure.in         |    3 ++-

 frontend/Makefile.am |    2 +-

 frontend/input.c     |    2 +-

 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in

index 6895c57..4002f51 100755

--- a/configure.in

+++ b/configure.in

@@ -31,11 +31,12 @@ AM_CONDITIONAL(WITH_MP4V2, false)

 AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],

                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,

-                            external_mp4v2=no, -lstdc++),

+                            external_mp4v2=no),

                external_mp4v2=no, [#include <mp4.h>])

 if test x$external_mp4v2 = xyes; then

   AC_MSG_NOTICE([*** Building with external mp4v2 ***])

+	MY_DEFINE(HAVE_LIBMP4V2)

 else

   if test x$WITHMP4V2 = xyes; then

      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])

diff --git a/frontend/Makefile.am b/frontend/Makefile.am

index 2bc0744..8a8dd8c 100755

--- a/frontend/Makefile.am

+++ b/frontend/Makefile.am

@@ -7,5 +7,5 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2

 LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++

 else

 INCLUDES = -I$(top_srcdir)/include 

-LDADD = $(top_builddir)/libfaac/libfaac.la -lm

+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm

 endif

diff --git a/frontend/input.c b/frontend/input.c

index 9c3749a..d75215e 100755

--- a/frontend/input.c

+++ b/frontend/input.c

@@ -78,7 +78,7 @@ WAVEFORMATEX;

 typedef struct

 {

-  WAVEFORMATEX Format;

+	WAVEFORMATEX Format __attribute__((packed));

   union {

     u_int16_t wValidBitsPerSample;	// bits of precision

     u_int16_t wSamplesPerBlock;		// valid if wBitsPerSample==0