From ddb70fda5047cd8cea1027893d337a607e9916a7 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 15 May 2007 21:23:53 +0000 Subject: ext/x264/gstx264enc.c (gst_x264_enc_init_encoder): This needs a version check. Original commit message from CVS: * ext/x264/gstx264enc.c (gst_x264_enc_init_encoder): This needs a version check. * gst/bayer/Makefile.am: Fix the build. --- ChangeLog | 8 ++++++++ ext/x264/gstx264enc.c | 2 +- gst/bayer/Makefile.am | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f037619..9b5c7d79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-05-16 Stefan Kost + + * ext/x264/gstx264enc.c (gst_x264_enc_init_encoder): + This needs a version check. + + * gst/bayer/Makefile.am: + Fix the build. + 2007-05-15 Tim-Philipp Müller * configure.ac: diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 5105f98d..4b8cea66 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -577,7 +577,7 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder) encoder->x264param.vui.i_vidformat = 5; /* unspecified */ encoder->x264param.analyse.i_trellis = encoder->trellis ? 1 : 0; encoder->x264param.analyse.b_psnr = 0; - encoder->x264param.analyse.b_ssim = 0; + /*encoder->x264param.analyse.b_ssim = 0; */ encoder->x264param.analyse.i_me_method = encoder->me; encoder->x264param.analyse.i_subpel_refine = encoder->subme; encoder->x264param.analyse.inter = encoder->analyse; diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am index 04c09326..b4001502 100644 --- a/gst/bayer/Makefile.am +++ b/gst/bayer/Makefile.am @@ -1,6 +1,7 @@ plugin_LTLIBRARIES = libgstbayer.la libgstbayer_la_SOURCES = gstbayer.c gstbayer2rgb.c -libgstbayer_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lgstbase-0.10 +libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstbayer_la_LIBADD = $(GST_BASE_LIBS) +libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -- cgit v1.2.1