gst/autoplug/gstspideridentity.c: Cosmetic fix - spider_find_peek should be static

Original commit message from CVS:
* gst/autoplug/gstspideridentity.c:
Cosmetic fix - spider_find_peek should be static
* gst/parse/parse.l:
Applying fix for #164261

diff --git a/ChangeLog b/ChangeLog
index 3338a99..7cec6bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19  Jan Schmidt  <thaytan@mad.scientist.com>
+       * gst/autoplug/gstspideridentity.c:
+       Cosmetic fix - spider_find_peek should be static
+       * gst/parse/parse.l:
+       Applying fix for #164261
+
 2005-01-18  Stefan Kost  <ensonic@users.sf.net>
 
        * docs/gst/gstreamer-sections.txt:

diff --git a/gst/autoplug/gstspideridentity.c b/gst/autoplug/gstspideridentity.c
index eed5352..f80ddc8 100644 (file)
--- a/gst/autoplug/gstspideridentity.c
+++ b/gst/autoplug/gstspideridentity.c
@@ -224,6 +224,7 @@ gst_spider_identity_chain (GstPad * pad, GstBuffer * buf)
     gst_buffer_unref (buf);
   }
 }
+
 GstSpiderIdentity *
 gst_spider_identity_new_src (gchar * name)
 {
@@ -478,7 +479,7 @@ typedef struct
   GstCaps *caps;
 }
 SpiderTypeFind;
-guint8 *
+static guint8 *
 spider_find_peek (gpointer data, gint64 offset, guint size)
 {
   SpiderTypeFind *find = (SpiderTypeFind *) data;

diff --git a/gst/parse/parse.l b/gst/parse/parse.l
index 5539be7..dc3e4fe 100644 (file)
--- a/gst/parse/parse.l
+++ b/gst/parse/parse.l
@@ -39,7 +39,7 @@ _comma [[:space:]]*","[[:space:]]*
 _assign [[:space:]]*"="[[:space:]]*
 
 _protocol [[:alpha:]][[:alnum:]+-\.]*
-_url {_protocol}"://"{_string}|["."{_identifier}]?"/"{_string}
+_url ({_protocol}"://"{_string}|["."{_identifier}]?"/"{_string})|({_protocol}"://")
 
 /* we must do this here, because nearly everything matches a {_string} */ 
 _assignment {_identifier}{_assign}{_string}