From 6a320f9acbf0085472cad7d77f7948ab3dc4df07 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" 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. --- ext/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ext') 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