diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-07-28 11:47:03 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-07-28 11:47:03 +0000 |
| commit | b886b8a303e674fc8fd58994847a0c375217e920 (patch) | |
| tree | f6ff8fed8ffb6fd7e6a18584de8ad2417575075c | |
| parent | c4fcb1bddd45bdd537c7428ba497fc6cf8ebc6af (diff) | |
| download | gstreamer-plugins-bad-b886b8a303e674fc8fd58994847a0c375217e920.tar.gz | |
configure.ac: Bump libx264 requirement to a more recent version (my version had x264_nal_encode, but X264_ME_UMH was ...
Original commit message from CVS:
* configure.ac:
Bump libx264 requirement to a more recent version (my version had
x264_nal_encode, but X264_ME_UMH was missing from the header file,
among other things)
* ext/x264/x264enc.c:
Use "_stdint.h" instead of <stdint.h>
* ext/x264/x264enc.h:
* ext/mad/gstid3demuxbin.c:
HAVE_CONFIG_G => HAVE_CONFIG_H
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,17 @@ +2005-07-28 Tim-Philipp Müller <tim at centricular dot net> + + * configure.ac: + Bump libx264 requirement to a more recent version (my version had + x264_nal_encode, but X264_ME_UMH was missing from the header file, + among other things) + + * ext/x264/x264enc.c: + Use "_stdint.h" instead of <stdint.h> + + * ext/x264/x264enc.h: + * ext/mad/gstid3demuxbin.c: + HAVE_CONFIG_G => HAVE_CONFIG_H + 2005-07-28 Michael Smith <msmith@fluendo.com> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> diff --git a/configure.ac b/configure.ac index e567d3fb0..24b761f6e 100644 --- a/configure.ac +++ b/configure.ac @@ -1792,7 +1792,7 @@ GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [ 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, + GST_CHECK_LIBHEADER(X264, x264, x264_encoder_reconfig, -lm, x264.h, X264_LIBS="$LDFLAGS -lx264 -lm" X264_CFLAGS="$CFLAGS" AC_SUBST(X264_LIBS) |