Skip to content
Browse files

Merge branch 'master' into gstreamer_encoder

  • Loading branch information...
2 parents 8e52e28 + 0bddf80 commit a73fd765e5e06cdc4d83c7365b9d872b626cca41 @toots toots committed Nov 24, 2012
Showing with 12 additions and 11 deletions.
  1. +3 −3 README
  2. +1 −1 doc/content/index.txt
  3. +1 −1 doc/liquidsoap.1
  4. +1 −1 examples/README
  5. +1 −1 scripts/shoutcast.liq
  6. +3 −2 src/decoder/gstreamer_decoder.ml
  7. +1 −1 src/lang/lang_builtins.ml
  8. +1 −1 src/main.ml
View
6 README
@@ -4,7 +4,7 @@ Liquidsoap 1.0.1
Copyright 2003-2012 Savonet team
Email : savonet-users@lists.sourceforge.net
-Homepage: http://savonet.sf.net/
+Homepage: http://liquidsoap.fm
Trac : http://dev.sourcefabric.org/browse/LS
INSTALLATION
@@ -15,8 +15,8 @@ See the INSTALL file.
DOCUMENTATION
=============
-Some documentation is available on our website:
- http://savonet.sf.net/
+Some documentation is available on our website:
+ http://liquidsoap.fm
You should find some HTML doc in the distribution:
doc/html/index.html
View
2 doc/content/index.txt
@@ -27,7 +27,7 @@ It guides you through these pages,
starting with the "quickstart tour":quick_start.html.
Liquidsoap is an open-source sofware
-from the "Savonet":http://savonet.sf.net project.
+from the "Savonet":http://liquidsoap.fm project.
h3. Features
View
2 doc/liquidsoap.1
@@ -36,7 +36,7 @@ A script will be read from standard input if
.B \-
is given as script filename.
Information about scripting liquidsoap is available on our website:
-.B http://savonet.sf.net/
+.B http://liquidsoap.fm
If the parameter is not a file it will be treated as an expression which will
be executed. It is a convenient way to test simple one-line scripts. When
View
2 examples/README
@@ -7,4 +7,4 @@ they'll fail to startup with an "infallible source" error.
* fallible.liq example of fallible scheduler
* transitions.liq an example of custom transitions
-Find some more doc and examples on <http://savonet.sf.net>.
+Find some more doc and examples on <http://liquidsoap.fm>.
View
2 scripts/shoutcast.liq
@@ -21,7 +21,7 @@ def output.shoutcast(
~id="output.shoutcast",~start=true,
~host="localhost",~port=8000,
~user="source",~password="hackme",
- ~genre="Misc",~url="http://savonet.sf.net/",
+ ~genre="Misc",~url="http://liquidsoap.fm",
~name="Liquidsoap Radio!",~public=true, ~format="",
~dumpfile="", ~icy_metadata="guess",
~on_connect={()}, ~on_disconnect={()},
View
5 src/decoder/gstreamer_decoder.ml
@@ -206,11 +206,12 @@ let mime_types =
Dtools.Conf.list ~p:(Decoder.conf_mime_types#plug "gstreamer")
"Mime-types used for guessing format handled by GStreamer"
~d:["video/x-ms-asf";"video/x-msvideo";
- "video/mp4";"video/3gpp";"video/webm"]
+ "video/mp4";"video/3gpp";"video/webm";
+ "video/x-matroska"]
let file_extensions =
Dtools.Conf.list ~p:(Decoder.conf_file_extensions#plug "gstreamer")
"File extensions used for guessing format handled by GStreamer"
- ~d:["wmv";"avi";"mp4";"3gp";"webm"]
+ ~d:["wmv";"avi";"mp4";"3gp";"webm";"mkv"]
let create_file_decoder filename content_type kind =
let mode =
View
2 src/lang/lang_builtins.ml
@@ -912,7 +912,7 @@ let () =
* errors. *)
add_builtin "_[_]" ~cat:List
~descr:"l[k] returns the first v such that \
- (k,v) is in the list l."
+ (k,v) is in the list l (or \"\" if no such v exists)."
["",Lang.string_t,None,None ;
"",Lang.metadata_t,None,None]
Lang.string_t
View
2 src/main.ml
@@ -452,7 +452,7 @@ let options =
Copyright (c) 2003-2012 Savonet team\n\
Liquidsoap is open-source software, \
released under GNU General Public License.\n\
- See <http://savonet.sf.net> for more information.\n"
+ See <http://liquidsoap.fm> for more information.\n"
Configure.version SVN.rev ;
exit 0),
"Display liquidsoap's version." ;

0 comments on commit a73fd76

Please sign in to comment.
Something went wrong with that request. Please try again.