Change some files for Peter; add mpeg1 layer 2 audio encoding

FEATURES.html

@@ -66,7 +66,7 @@ <h2>Mp4live Features</h2>
 Audio Encoders:
 <br>AAC (faac, with required download), MP3 (lame, with required download)
 Mpeg2, layer 2 (with ffmpeg), AMR NB and WB (through ffmpeg), G.711 alaw
-and ulaw 
+and ulaw, Mpeg1, layer 2 (with twolame)
 <p>
 Video Filters:
 <br>de-interlace (Y only), decimate

VERSION

@@ -1 +1 @@
-1.5.14
+1.5.15

configure.in

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(mpeg4ip, 1.5.14)
+AC_INIT(mpeg4ip, 1.5.15)
 AM_CONFIG_HEADER(mpeg4ip_config.h)
 dnl Prevent user from running just ./configure
 AC_CHECK_FILE(./bootstrapped, [did_bootstrap=yes], [did_bootstrap=no])
@@ -524,6 +524,7 @@ AM_CONDITIONAL(HAVE_FFMPEG, [test x$have_ffmpeg = xtrue])
 LAME_LIB=
 FAAC_LIB=
 X264_LIB=
+TWOLAME_LIB=
 
 if test x$have_mp4live = xtrue; then
 
@@ -554,6 +555,31 @@ else
    LAME_LIB=
 fi
 
+AC_ARG_ENABLE(twolame,
+[AC_HELP_STRING([--disable-twolame],[disable use of installed twolame library])],
+[ case "${enableval}" in
+  no)  disable_it=yes ;;
+  yes) disable_it=no ;;
+  *) AC_MSG_ERROR([bad valud ${enableval} for --disable-twolame]) ;;
+esac],
+  [disable_it=no])
+
+if test x$disable_it = xyes; then
+  have_twolame=false
+  AC_MSG_NOTICE([disabling twolame library])
+else
+  saved_LIBS="$LIBS"
+  LIBS="$LIBS -lm -lz"
+  AC_CHECK_LIB(twolame, twolame_init, [have_twolame=true], [have_twolame=false])
+  LIBS=$saved_LIBS
+fi
+if test x$have_twolame = xtrue; then
+   AC_DEFINE(HAVE_TWOLAME, 1, [enable twolame for mp4live])
+   TWOLAME_LIB=-ltwolame
+else
+   TWOLAME_LIB=
+fi
+
 AC_ARG_ENABLE(faac,
 [AC_HELP_STRING([--disable-faac],[disable use of installed faac library])],
 [ case "${enableval}" in
@@ -612,6 +638,7 @@ fi
 AC_SUBST(LAME_LIB)
 AC_SUBST(FAAC_LIB)
 AC_SUBST(X264_LIB)
+AC_SUBST(TWOLAME_LIB)
 AM_CONDITIONAL(HAVE_X264, [test x$have_x264 = xtrue])
 
 AC_ARG_ENABLE(ipv6,

doc/MAINREADME.html

@@ -204,6 +204,7 @@ <h2>Prerequisites for Building</h2>
 <li><a href="http://www.audiocoding.com">faac</a>, version 1.20.1 or later<br>
 If you are using a released or CVS version after version 1.24, use the --with=mp4v2=no option </li>
 <li><a href="http://lame.sourceforge.net">lame</a> (mp3 encoding)</li>
+<li><a href="http://www.twolame.org">twolame</a> (mpeg1, layer 2 encoding)</li>
 <li><a href="http://ffmpeg.sourceforge.net">ffmpeg</a> (H.263, mpeg-4, mpeg-2 
 video content, AMR, mpeg-2 audio)</li>
 <li><a href="http://www.xvid.org">xvid</a> (mpeg-4 video encoding)</li>

doc/MP4LIVE_README.html

@@ -174,8 +174,8 @@ <h2>WARNINGS!</h2>
 <p>
 We no longer include a mpeg-4 encoder native with the package.  You will
 have to download ffmpeg or xvid if you want to encode with mpeg-4.  You 
-will also want to include a good audio encoder, like faac or lame.  See
-the main readme for more information.
+will also want to include a good audio encoder, like faac, lame or twolame.  
+See the main readme for more information.
 <P>
 By far the easiest route is to use a Linux distribution that already has a
 2.6 kernel and the bttv driver, and the associated i2c module built into it.
@@ -715,6 +715,10 @@ <h2>Links</h2>
   <td>LAME</td>			
   <td><a href="http://www.sourceforge.net/projects/lame">http://www.sourceforge.net/projects/lame</a></td>
 </tr>
+<tr>
+  <td>TWOLAME</td>			
+  <td><a href="http://www.twolame.org">http://www.twolame.org</a></td>
+</tr>
 <tr>
   <td>FAAC</td>			
   <td><a href="http://www.audiocoding.com">http://www.audiocoding.com</a></td>