diff --git a/ChangeLog b/ChangeLog index 669e62d9f2..3f7ea150a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-13 Jan Schmidt + + * ext/dirac/gstdiracenc.cc: + Fix compilation by casting string constants. + + * sys/Makefile.am: + Fix WININET_DIR variable reference. + 2008-04-13 Jan Schmidt * configure.ac: diff --git a/common b/common index d3ace35f57..bdc5172b0b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d3ace35f57dd196a3e83a0a48f1350ca32db8e39 +Subproject commit bdc5172b0ba183be6d92e58cb51782c23e9f2127 diff --git a/ext/dirac/gstdiracenc.cc b/ext/dirac/gstdiracenc.cc index c6ed5c6b06..8e203d3ab2 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 "); + GST_ELEMENT_DETAILS ((gchar *) "Dirac Encoder", + (gchar *) "Codec/Encoder/Video", + (gchar *) "Encode raw YUV video into Dirac stream", + (gchar *) "David Schleef "); 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 95ba873955..aa77cd6e01 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