summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 16:49:54 +0000
committermal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 16:49:54 +0000
commit3fbeee9677362e033db2600ea3c3f3db1ab83d86 (patch)
tree3fdb5ad21eeb23886a8d3b2a2fae4a953556b121
parent816a663dbdd9fddb15858b43d6cbd74cd6e60c30 (diff)
downloadchromium_src-3fbeee9677362e033db2600ea3c3f3db1ab83d86.zip
chromium_src-3fbeee9677362e033db2600ea3c3f3db1ab83d86.tar.gz
chromium_src-3fbeee9677362e033db2600ea3c3f3db1ab83d86.tar.bz2
Add ffmpeg to about:terms.
BUG=http://crbug.com/12839 Review URL: http://codereview.chromium.org/113986 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17321 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/about_credits.html26
1 files changed, 26 insertions, 0 deletions
diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html
index 4001238..b48d254 100644
--- a/chrome/browser/resources/about_credits.html
+++ b/chrome/browser/resources/about_credits.html
@@ -1299,5 +1299,31 @@ Published: October 12, 2006
</div>
</div>
+<!-- FFMPEG -->
+<div class="product">
+<span class="title">ffmpeg</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://www.ffmpeg.org/">homepage</a></span>
+<div class="licence">
+<h3>ffmpeg is licensed as follows:</h3>
+<p>FFmpeg is free software; you can redistribute it and/or modify it under the
+terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.</p>
+<p>FFmpeg is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+details.
+</p>
+<p>You should have received a copy of the GNU Lesser General Public License
+along with FFmpeg; if not, write to:</p>
+<p> Free Software Foundation, Inc.<br>
+ 59 Temple Place<br>
+ Suite 330<br>
+ Boston, MA 02111-1307<br>
+ USA</p>
+</div>
+</div>
+
</body>
</html>