summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Decina <alessandro.d@gmail.com>2009-01-02 01:44:11 +0000
committerAlessandro Decina <alessandro.d@gmail.com>2009-01-02 01:44:11 +0000
commit833807a67ffb0cd8ce75232b9ac1fdf6d77725cf (patch)
tree46685f5a43ff6d0ce9f7f26072be3dabfee6ce4e
parent1d71d95218e6615ee8edc8fdf38a83c6479d5d3f (diff)
ext/apexsink/Makefile.am: Link against -lgcrpyto for RSA_new and RSA_free.
Original commit message from CVS: * ext/apexsink/Makefile.am: Link against -lgcrpyto for RSA_new and RSA_free. * ext/faac/gstfaac.c: * ext/x264/gstx264enc.c: Fix compiler warnings.
-rw-r--r--ChangeLog8
-rw-r--r--ext/apexsink/Makefile.am2
-rw-r--r--ext/faac/gstfaac.c2
-rw-r--r--ext/x264/gstx264enc.c2
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fa7b48364..ea6906720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-01-02 Alessandro Decina <alessandro.d@gmail.com>
+ * ext/apexsink/Makefile.am:
+ Link against -lgcrpyto for RSA_new and RSA_free.
+ * ext/faac/gstfaac.c:
+ * ext/x264/gstx264enc.c:
+ Fix compiler warnings.
+
+2009-01-02 Alessandro Decina <alessandro.d@gmail.com>
+
* gst/mpegdemux/gstmpegdemux.c:
Initialize scr_rate_n and scr_rate_d in order to fix compiler warnings.
diff --git a/ext/apexsink/Makefile.am b/ext/apexsink/Makefile.am
index b92687ce1..0d216345f 100644
--- a/ext/apexsink/Makefile.am
+++ b/ext/apexsink/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstapexsink.la
libgstapexsink_la_SOURCES = gstapexplugin.c gstapexraop.c gstapexsink.c
libgstapexsink_la_CFLAGS = $(APEXSINK_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstapexsink_la_LIBADD = $(APEXSINK_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
-libgstapexsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstapexsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lcrypto
libgstapexsink_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstapexraop.h gstapexsink.h
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index f802568ac..22484ffbd 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -401,7 +401,7 @@ gst_faac_configure_source_pad (GstFaac * faac)
.5);
if (conf->bitRate > maxbitrate) {
GST_ELEMENT_WARNING (faac, RESOURCE, SETTINGS, (NULL),
- ("bitrate %u exceeds maximum allowed bitrate of %u for samplerate %d. "
+ ("bitrate %lu exceeds maximum allowed bitrate of %u for samplerate %d. "
"Setting bitrate to %u", conf->bitRate, maxbitrate,
faac->samplerate, maxbitrate));
conf->bitRate = maxbitrate;
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index 649366cd4..21f7b0da9 100644
--- a/ext/x264/gstx264enc.c
+++ b/ext/x264/gstx264enc.c
@@ -617,7 +617,7 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder)
encoder->x264enc = x264_encoder_open (&encoder->x264param);
if (!encoder->x264enc) {
GST_ELEMENT_ERROR (encoder, STREAM, ENCODE,
- ("Can not initialize x264 encoder."), (""));
+ ("Can not initialize x264 encoder."), (NULL));
return FALSE;
}