[FFmpeg-cvslog] [ffmpeg.org]: r533 - in trunk/src: consulting legal shame

[diego]

Author: diego
Date: Thu Jan 20 23:52:12 2011
New Revision: 533

Log:
Properly escape spaces and ampersands in URLs.

patch by Lou Logan, lou fakeoutdoorsman com

Modified:
   trunk/src/consulting
   trunk/src/legal
   trunk/src/shame

Modified: trunk/src/consulting
==============================================================================
--- trunk/src/consulting	Wed Jan 19 13:49:29 2011	(r532)
+++ trunk/src/consulting	Thu Jan 20 23:52:12 2011	(r533)
@@ -54,7 +54,7 @@
 Benjamin Larsson is located in Stockholm, Sweden and is available for contracting
 work. He has worked on FFmpeg since 2004. Main area of expertise is audio codecs.
 You can contact him by email at
-<a href="mailto:benjamin at southpole dot se">benjamin at southpole dot se</a>.
+<a href="mailto:benjamin%20at%20southpole%20dot%20se">benjamin at southpole dot se</a>.
 </p>
 
 <h2>Diego Biurrun</h2>
@@ -63,7 +63,7 @@
 He has worked on FFmpeg since 2003 and is a committer since 2004.
 He has special expertise in license compliance engineering and build
 systems.  You can contact him by email at
-<a href="mailto:diego at biurrun dot de">diego at biurrun dot de</a>.
+<a href="mailto:diego%20at%20biurrun%20dot%20de">diego at biurrun dot de</a>.
 </p>
 
 <h2>Jason Garrett-Glaser</h2>
@@ -89,7 +89,7 @@
 Michael is located in Vienna, Austria and available for contracting work.
 He is the former FFmpeg project leader.
 He is an expert in all areas of video coding as well as x86 assembly.
-You can contact him by email at <a href="mailto:michaelni at gmx dot at">michaelni at gmx dot at</a>.
+You can contact him by email at <a href="mailto:michaelni%20at%20gmx%20dot%20at">michaelni at gmx dot at</a>.
 </p>
 
 <h2>Stefano Sabatini</h2>

Modified: trunk/src/legal
==============================================================================
--- trunk/src/legal	Wed Jan 19 13:49:29 2011	(r532)
+++ trunk/src/legal	Thu Jan 20 23:52:12 2011	(r533)
@@ -63,7 +63,7 @@
 <li> Use tarball or a zip file for distributing the source code. </li>
 <li> Host the FFmpeg source code on the same webserver as the binary you are
 distributing. </li>
-<li> Add "This software uses code of &#60a href=http://ffmpeg.org&#62FFmpeg&#60/a&#62 licensed under the &#60a href=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&#62LGPLv2.1&#60/a&#62 and its source can be downloaded &#60a href=link_to_your_sources&#62here&#60/a&#62" to every page in your website where there is a download link to your application. </li>
+<li> Add "This software uses code of <a href=http://ffmpeg.org>FFmpeg</a> licensed under the <a href=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>LGPLv2.1</a> and its source can be downloaded <a href=link_to_your_sources>here</a>" to every page in your website where there is a download link to your application. </li>
 <li> Mention "This software uses libraries from the FFmpeg project under the
 LGPLv2.1" in your program "about box". </li>
 <li> Mention in your EULA that your program uses FFmpeg under the LGPLv2.1.</li>

Modified: trunk/src/shame
==============================================================================
--- trunk/src/shame	Wed Jan 19 13:49:29 2011	(r532)
+++ trunk/src/shame	Thu Jan 20 23:52:12 2011	(r533)
@@ -82,7 +82,7 @@
 <a href="http://roundup.ffmpeg.org/roundup/ffmpeg/issue1214">issue tracker entry</a></li>
 <li><a href="http://www.winxdvd.com/" rel="nofollow">FreeTime Soft</a>,
 <a href="http://roundup.ffmpeg.org/roundup/ffmpeg/issue722">issue tracker entry</a></li>
-<li><a href="http://www.sourcemac.com/?page=fstream&lang=en" rel="nofollow">FStream</a>,
+<li><a href="http://www.sourcemac.com/?page=fstream&lang=en" rel="nofollow">FStream</a>,
 <a href="http://roundup.ffmpeg.org/roundup/ffmpeg/issue1471">issue tracker entry</a>,
 reproduced 2009-11-03</li>
 <li><a href="http://www.geovid.com" rel="nofollow">GeoVid</a>,