summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-01 17:23:44 +0000
committergabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-01 17:23:44 +0000
commit1b7753370d4ec70f125961884155c34c1aed2e28 (patch)
tree68b028f8078f99c81f7589d476949ef86d50d902 /DOCS
parent88fc938bd926a34adc508eea09a779e0d2606fb4 (diff)
downloadmpv-1b7753370d4ec70f125961884155c34c1aed2e28.tar.bz2
mpv-1b7753370d4ec70f125961884155c34c1aed2e28.tar.xz
licensing stuff fixed/added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2036 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/Hungarian/documentation.html4
-rw-r--r--DOCS/documentation.html5
2 files changed, 6 insertions, 3 deletions
diff --git a/DOCS/Hungarian/documentation.html b/DOCS/Hungarian/documentation.html
index daff807102..5e3924912d 100644
--- a/DOCS/Hungarian/documentation.html
+++ b/DOCS/Hungarian/documentation.html
@@ -132,8 +132,8 @@ akár nem-x86 processzorokon is. Lásd a <A HREF="#6">6-os fejezetet</A>).
ami támogat magyar, angol, cirill, cseh és koreai fontokat, valamint
OSD-t!</P>
-<P>Az <B>MPlayer</B> a <A HREF="http://www.gnu.org/licenses/gpl.html">GNU GPL</A>
-licensz alá tartozik, KIVÉVE az OpenDivX kódot.</P>
+<P>Az <B>MPlayer</B> a <A HREF="http://www.gnu.org/licenses/gpl.html">GNU GPL</A> licensz alá tartozik (leszámítva hogy binárisok terjesztése
+<B>tilos</B>), KIVÉVE az OpenDivX kódot, aminek saját licensze van.</P>
<P>Nem codeceket írtam, csak néhány lejátszót. Sok időt töltöttem azzal is, hogy
megtaláljam a megfelelő módszert a hibás file-ok beolvasására (mind MPEG,
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 207b7d1700..5c0352808a 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -128,7 +128,10 @@ supports software or hardware scaling, so you can enjoy movies in fullscreen.
And what about the nice big antialiased shaded subtitles (7 supported types!!!)
with hungarian, english, cyrillic, czech, korean fonts, and OSD?</P>
-<P>MPlayer is distributable under the terms of the <A HREF="http://www.gnu.org/licenses/gpl.html">GNU GPL</A>, EXCEPT the OpenDivX code.</P>
+<P>MPlayer is distributable under the terms of the <A
+HREF="http://www.gnu.org/licenses/gpl.html">GNU GPL</A> (but distributing
+binary packages if <B>forbidden</B>!), EXCEPT the OpenDivX code which has its
+own license.</P>
<P>I didn't write any codecs, just some players. I spent
a lot of time finding the best way to parse bad damaged input files