diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-23 22:14:03 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-23 22:14:03 +0000 |
| commit | 6a320f9acbf0085472cad7d77f7948ab3dc4df07 (patch) | |
| tree | 7aa31422a2d0d521ff9f88cae9198c0e532370f9 | |
| parent | 9b9b9d5c6f3d2507677f777ca4271d93730f1e6a (diff) | |
| download | gstreamer-plugins-bad-6a320f9acbf0085472cad7d77f7948ab3dc4df07.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
3 files changed, 34 insertions, 0 deletions
@@ -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 0c15fb821..b24b107d2 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 c57088374..dff4d6cf5 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 |