[streaming] vls small patch for mp3lame and ffmpeg

[Stefan Seyfried]

Hi,

while trying out cvs of yesterday (5.11.03) i got 2 small oddities,
my ffmpeg is compiled with mp3lame.
diffs:

seife at heppo:/usr/local/src/VLC-CVS/vls> diff -u1 src/Makefile.am{-sav,}
--- src/Makefile.am-sav 2003-11-06 18:37:00.000000000 +0100
+++ src/Makefile.am     2003-11-06 18:37:15.000000000 +0100
@@ -15,3 +15,3 @@
 
-vls_LDADD = @VLS_LDFLAGS@ @VLS_LIB@ @RAW2TS_LIBADD@ @DVDREADER_LIBADD@
+vls_LDADD = @VLS_LDFLAGS@ @VLS_LIB@ @RAW2TS_LIBADD@ @DVDREADER_LIBADD@ @LAME_LIBADD@
 # FIXME: use the .la file! export the _LIBADD variables!
seife at heppo:/usr/local/src/VLC-CVS/vls> diff -u1 src/modules/v4lreader/Makefile.am{-sav,}  
--- src/modules/v4lreader/Makefile.am-sav       2003-11-06 19:14:01.000000000 +0100
+++ src/modules/v4lreader/Makefile.am   2003-11-06 18:44:29.000000000 +0100
@@ -8,3 +8,3 @@
 v4lreader_la_SOURCES = v4lreader.cpp v4lreader.h
-v4lreader_la_CXXFLAGS = $(LTFLAGS)
+v4lreader_la_CXXFLAGS = $(LTFLAGS) $(RAW2TS_CXXFLAGS)
 v4lreader_la_LDFLAGS = -module -avoid-version -no-undefined $(LTFLAGS)
seife at heppo:/usr/local/src/VLC-CVS/vls> diff -u1 configure.ac{-sav,}                     
--- configure.ac-sav    2003-11-06 18:33:18.000000000 +0100
+++ configure.ac        2003-11-06 19:08:50.000000000 +0100
@@ -398,2 +398,4 @@
 AC_HELP_STRING(--with-ffmpeg=[PATH], path to ffmpeg header files))
+AC_ARG_ENABLE(ffmp3lame,
+AC_HELP_STRING(--enable-ffmp3lame, ffmpeg is compiled with lame support))
 AC_ARG_WITH(v4l,
@@ -401,2 +403,7 @@
 
+if test "$enable_ffmp3lame" = "yes"
+then
+  LAME_LIBADD="${LAME_LIBADD} -lmp3lame"
+fi
+
 if test "$enable_v4l" = "yes"
@@ -571,2 +578,4 @@
 
+AC_SUBST(LAME_LIBADD)
+
 AC_SUBST(TCPINPUT_LIBADD)
seife at heppo:/usr/local/src/VLC-CVS/vls> 

Fortunately, i never had anything to do with auto* until today, so this
may not be perfect. e.g. i tried to make it "--enable-fmpeg-mp3lame" but
it just didn't work ;-)
Also the $(RAW2TS_CXXFLAGS) in vl4reader/ are probably not perfect, but it
at least works for me. Compilation succeeded with the following configure:
./configure --with-ffmpeg=/usr/local/src/ffmpeg --enable-v4l --enable-ffmp3lame
Now i have to try if it works ;-)

regards,
 
     Stefan
-- 
 Stefan Seyfried, seife at gmane0305.slipkontur.de
+----------------------------------------------+

"If you want to travel around the world and be invited to speak at a lot of
 different places, just write a Unix operating system." -- [Linus Torvalds]

-- 
This is the streaming mailing-list, see http://www.videolan.org/streaming/
To unsubscribe, please read http://www.videolan.org/support/lists.html
If you are in trouble, please contact <postmaster at videolan.org>