summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-09-29 19:36:34 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-09-29 19:36:34 +0000
commitc553adff7a7e90231fb4e74cced3b895f60e04e7 (patch)
treea502a26dd4224ffef81d4d7703a1b68dbeb6b4b5
parent68a1d6cfd59d02d70f08bbb4a78a1de5ab4b2c22 (diff)
downloadgst-plugins-bad-c553adff7a7e90231fb4e74cced3b895f60e04e7.tar.gz
gst-plugins-bad-c553adff7a7e90231fb4e74cced3b895f60e04e7.tar.bz2
gst-plugins-bad-c553adff7a7e90231fb4e74cced3b895f60e04e7.zip
ext/mythtv/gstmythtvsrc.c: Re-apply docs patch from #468039; fix tab.
Original commit message from CVS: * ext/mythtv/gstmythtvsrc.c: Re-apply docs patch from #468039; fix tab. * gst/mpegtsparse/.cvsignore: Ignore marshaller files generated at build time.
-rw-r--r--ChangeLog8
-rw-r--r--ext/mythtv/gstmythtvsrc.c6
-rw-r--r--gst/mpegtsparse/.gitignore3
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 53cb9ec6..22bfc3dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-29 Tim-Philipp Müller <tim at centricular dot net>
+
+ * ext/mythtv/gstmythtvsrc.c:
+ Re-apply docs patch from #468039; fix tab.
+
+ * gst/mpegtsparse/.cvsignore:
+ Ignore marshaller files generated at build time.
+
2007-09-29 Sebastian Dröge <slomo@circular-chaos.org>
* ext/gio/gstgiosink.c: (gst_gio_sink_base_init),
diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c
index cd142033..06825fb3 100644
--- a/ext/mythtv/gstmythtvsrc.c
+++ b/ext/mythtv/gstmythtvsrc.c
@@ -87,7 +87,7 @@
GST_DEBUG_CATEGORY_STATIC (mythtvsrc_debug);
#define GST_GMYTHTV_ID_NUM 1
#define GST_GMYTHTV_CHANNEL_DEFAULT_NUM (-1)
-#define GMYTHTV_VERSION_DEFAULT 30
+#define GMYTHTV_VERSION_DEFAULT 30
#define GMYTHTV_TRANSFER_MAX_WAITS 100
#define GMYTHTV_TRANSFER_MAX_RESENDS 2
#define GMYTHTV_TRANSFER_MAX_BUFFER (128*1024)
@@ -201,7 +201,9 @@ gst_mythtv_src_class_init (GstMythtvSrcClass * klass)
g_param_spec_string ("location", "Location",
"The location. In the form:"
"\n\t\t\tmyth://a.com/file.nuv"
- "\n\t\t\tmyth://a.com:23223/file.nuv "
+ "\n\t\t\tmyth://a.com:23223/file.nuv"
+ "\n\t\t\tmyth://a.com/?channel=123"
+ "\n\t\t\tmyth://a.com/?channel=Channel%203"
"\n\t\t\ta.com/file.nuv - default scheme 'myth'",
"", G_PARAM_READWRITE));
diff --git a/gst/mpegtsparse/.gitignore b/gst/mpegtsparse/.gitignore
new file mode 100644
index 00000000..59744e68
--- /dev/null
+++ b/gst/mpegtsparse/.gitignore
@@ -0,0 +1,3 @@
+mpegtsparsemarshal.c
+mpegtsparsemarshal.h
+