summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-08-16 16:12:14 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-08-16 16:12:14 +0000
commit2a4f274b81dd336850b7273c6a4ec3495c84d07e (patch)
tree11ad6947e0319db8ddaae3f067370824922abef7
parent61406d319d43496710257ab77be36c41ae015faf (diff)
downloadgst-plugins-bad-2a4f274b81dd336850b7273c6a4ec3495c84d07e.tar.gz
gst-plugins-bad-2a4f274b81dd336850b7273c6a4ec3495c84d07e.tar.bz2
gst-plugins-bad-2a4f274b81dd336850b7273c6a4ec3495c84d07e.zip
Fix compile warning.
Original commit message from CVS: * configure.ac: * ext/amrnb/amrnbparse.c: (gst_amrnbparse_read_header): Fix compile warning. * ext/lame/gstlame.c: (gst_lame_class_init), (gst_lame_src_getcaps), (gst_lame_src_setcaps), (gst_lame_sink_setcaps), (gst_lame_init), (gst_lame_sink_event), (gst_lame_chain), (gst_lame_change_state): * ext/lame/gstlame.h: Port lame plugin
-rw-r--r--ChangeLog13
-rw-r--r--configure.ac28
2 files changed, 39 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a23ebdd..7fd48d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-08-16 Wim Taymans <wim@fluendo.com>
+
+ * configure.ac:
+ * ext/amrnb/amrnbparse.c: (gst_amrnbparse_read_header):
+ Fix compile warning.
+
+ * ext/lame/gstlame.c: (gst_lame_class_init),
+ (gst_lame_src_getcaps), (gst_lame_src_setcaps),
+ (gst_lame_sink_setcaps), (gst_lame_init), (gst_lame_sink_event),
+ (gst_lame_chain), (gst_lame_change_state):
+ * ext/lame/gstlame.h:
+ Port lame plugin
+
2005-08-16 Andy Wingo <wingo@pobox.com>
* ext/raw1394/gstdv1394src.c (gst_dv1394src_iso_receive): Note
diff --git a/configure.ac b/configure.ac
index c65d5401..45ce24f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,8 +265,7 @@ dnl =================================================
# we set the defaults always to make sure we have non-empty variables
# for the Makefile
-PKG_CHECK_MODULES(LIBOIL, liboil-0.2, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
-#PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.0, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
+PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.0, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
AC_SUBST(LIBOIL_CFLAGS)
AC_SUBST(LIBOIL_LIBS)
if test "x${HAVE_LIBOIL}" = xyes ; then
@@ -411,6 +410,30 @@ return 0;
AC_SUBST(FAAD_LIBS)
])
+dnl *** lame ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
+GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
+ GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h,
+ [
+ HAVE_LAME="yes"
+ LAME_LIBS="-lmp3lame -lm"
+ dnl is lame presets available
+ LAME_CFLAGS=""
+ AC_TRY_RUN([
+#include <lame/lame.h>
+int main (int argc, char *argv[])
+{
+ printf("%d\n", MEDIUM);
+ return 0;
+}
+ ],
+ [LAME_CFLAGS="-DGSTLAME_PRESET"],
+ [LAME_CFLAGS=""]
+ )
+ AC_SUBST(LAME_CFLAGS)
+ AC_SUBST(LAME_LIBS)
+ ])
+])
dnl *** libcaca ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
@@ -629,6 +652,7 @@ ext/Makefile
ext/aalib/Makefile
ext/dv/Makefile
ext/gconf/Makefile
+ext/lame/Makefile
ext/libcaca/Makefile
ext/libpng/Makefile
ext/mad/Makefile