summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-04-13 20:54:52 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-04-13 20:54:52 +0000
commitc35c0acbe6ba2a0ece057d9f2588277f9b6f19aa (patch)
treefd2e0ae5da851b0a262a0e4c77ead0cc63216f18
parent92bb41c8f8ec1ac0ab1fb44104b8201142c100b4 (diff)
downloadgst-plugins-bad-c35c0acbe6ba2a0ece057d9f2588277f9b6f19aa.tar.gz
gst-plugins-bad-c35c0acbe6ba2a0ece057d9f2588277f9b6f19aa.tar.bz2
gst-plugins-bad-c35c0acbe6ba2a0ece057d9f2588277f9b6f19aa.zip
ext/dirac/gstdiracenc.cc: Fix compilation by casting string constants.
Original commit message from CVS: * ext/dirac/gstdiracenc.cc: Fix compilation by casting string constants. * sys/Makefile.am: Fix WININET_DIR variable reference.
-rw-r--r--ChangeLog8
m---------common0
-rw-r--r--ext/dirac/gstdiracenc.cc8
-rw-r--r--sys/Makefile.am2
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 669e62d9..3f7ea150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-04-13 Jan Schmidt <jan.schmidt@sun.com>
+ * ext/dirac/gstdiracenc.cc:
+ Fix compilation by casting string constants.
+
+ * sys/Makefile.am:
+ Fix WININET_DIR variable reference.
+
+2008-04-13 Jan Schmidt <jan.schmidt@sun.com>
+
* configure.ac:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
diff --git a/common b/common
-Subproject d3ace35f57dd196a3e83a0a48f1350ca32db8e3
+Subproject bdc5172b0ba183be6d92e58cb51782c23e9f212
diff --git a/ext/dirac/gstdiracenc.cc b/ext/dirac/gstdiracenc.cc
index c6ed5c6b..8e203d3a 100644
--- a/ext/dirac/gstdiracenc.cc
+++ b/ext/dirac/gstdiracenc.cc
@@ -151,10 +151,10 @@ static void
gst_dirac_enc_base_init (gpointer g_class)
{
static GstElementDetails dirac_enc_details =
- GST_ELEMENT_DETAILS ("Dirac Encoder",
- "Codec/Encoder/Video",
- "Encode raw YUV video into Dirac stream",
- "David Schleef <ds@schleef.org>");
+ GST_ELEMENT_DETAILS ((gchar *) "Dirac Encoder",
+ (gchar *) "Codec/Encoder/Video",
+ (gchar *) "Encode raw YUV video into Dirac stream",
+ (gchar *) "David Schleef <ds@schleef.org>");
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_add_pad_template (element_class,
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 95ba8739..aa77cd6e 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -52,7 +52,7 @@ else
WININET_DIR=
endif
-SUBDIRS = $(DVB_DIR) $(FBDEV_DIR) $(OSS4_DIR) $(QT_DIR) $(VCD_DIR) $(WININET)
+SUBDIRS = $(DVB_DIR) $(FBDEV_DIR) $(OSS4_DIR) $(QT_DIR) $(VCD_DIR) $(WININET_DIR)
DIST_SUBDIRS = dvb fbdev dshowdecwrapper dshowsrcwrapper oss4 qtwrapper vcd wininet