From 6a320f9acbf0085472cad7d77f7948ab3dc4df07 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sat, 23 Jul 2005 22:14:03 +0000
Subject: Add x264-based h264/AVC encoder.

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/x264/Makefile.am:
* ext/x264/plugin.c: (plugin_init):
* ext/x264/x264enc.c: (gst_x264enc_encoding_get_type),
(gst_x264enc_memethod_get_type), (gst_x264enc_log),
(gst_x264enc_base_init), (gst_x264enc_class_init),
(gst_x264enc_init), (gst_x264enc_getcaps), (gst_x264enc_setcaps),
(gst_x264enc_nal), (gst_x264enc_chain), (gst_x264enc_change_state),
(gst_x264enc_get_property), (gst_x264enc_set_property):
* ext/x264/x264enc.h:
Add x264-based h264/AVC encoder.
---
 ChangeLog       | 15 +++++++++++++++
 configure.ac    | 11 +++++++++++
 ext/Makefile.am |  8 ++++++++
 3 files changed, 34 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2cbcc980..58781bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-07-24  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	* ext/Makefile.am:
+	* ext/x264/Makefile.am:
+	* ext/x264/plugin.c: (plugin_init):
+	* ext/x264/x264enc.c: (gst_x264enc_encoding_get_type),
+	(gst_x264enc_memethod_get_type), (gst_x264enc_log),
+	(gst_x264enc_base_init), (gst_x264enc_class_init),
+	(gst_x264enc_init), (gst_x264enc_getcaps), (gst_x264enc_setcaps),
+	(gst_x264enc_nal), (gst_x264enc_chain), (gst_x264enc_change_state),
+	(gst_x264enc_get_property), (gst_x264enc_set_property):
+	* ext/x264/x264enc.h:
+	  Add x264-based h264/AVC encoder.
+
 2005-07-22  Benjamin Otte  <otte@gnome.org>
 
 	* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_capture_init),
diff --git a/configure.ac b/configure.ac
index 0c15fb82..b24b107d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1789,6 +1789,16 @@ GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [
   AC_SUBST(WAVPACK_LIBS)
 ])
 
+dnl *** libx264 (MPEG-4 part 10/h.264/AVC encoder) ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
+GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
+  GST_CHECK_LIBHEADER(X264, x264, x264_nal_encode, -lm, x264.h,
+      X264_LIBS="$LDFLAGS -lx264 -lm"
+      X264_CFLAGS="$CFLAGS"
+      AC_SUBST(X264_LIBS)
+      AC_SUBST(X264_CFLAGS))
+])
+
 dnl *** xine ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_XINE, true)
 GST_CHECK_FEATURE(XINE, [xine wrapper], xine, [
@@ -2170,6 +2180,7 @@ ext/tarkin/Makefile
 ext/theora/Makefile
 ext/vorbis/Makefile
 ext/wavpack/Makefile
+ext/x264/Makefile
 ext/xine/Makefile
 ext/xvid/Makefile
 gst-libs/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index c5708837..dff4d6cf 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -412,6 +412,12 @@ else
 WAVPACK_DIR=
 endif
 
+if USE_X264
+X264_DIR=x264
+else
+X264_DIR=
+endif
+
 if USE_XINE
 XINE_DIR=xine
 else
@@ -485,6 +491,7 @@ SUBDIRS=\
 	$(IVORBIS_DIR) \
 	$(VORBIS_DIR) \
 	$(WAVPACK_DIR) \
+	$(X264_DIR) \
 	$(XINE_DIR) \
 	$(XVID_DIR)
 
@@ -555,5 +562,6 @@ DIST_SUBDIRS=\
 	theora \
 	vorbis \
 	wavpack \
+	x264 \
 	xine \
 	xvid
-- 
cgit v1.2.1