Skip to content

Commit

Permalink
encoding License in UTF-8
Browse files Browse the repository at this point in the history
  • Loading branch information
mariodivece committed Mar 31, 2019
1 parent bd45911 commit 9bf03d7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
28 changes: 14 additions & 14 deletions LICENSE.md → LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ While the tool itself is distributed under the LGPLv3, the output of the tool do
a license. I leave it up to someone else to figure it out. In any case, here is a copy of the
license @RuslanB has posted on his GitHub repository:

Copyright © Ruslan Balanukhin 2015 All rights reserved.
Copyright © Ruslan Balanukhin 2015 All rights reserved.

Distributed under the GNU Lesser General Public License (LGPL) version 3.
http://www.gnu.org/licenses/lgpl.html
Expand Down Expand Up @@ -181,7 +181,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.


Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
Expand Down Expand Up @@ -237,7 +237,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.


GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

Expand Down Expand Up @@ -284,7 +284,7 @@ Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.


2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
Expand Down Expand Up @@ -342,7 +342,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.


Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
Expand Down Expand Up @@ -393,7 +393,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.


6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
Expand Down Expand Up @@ -455,7 +455,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.


7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
Expand Down Expand Up @@ -496,7 +496,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.


11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
Expand Down Expand Up @@ -548,7 +548,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.


14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
Expand Down Expand Up @@ -596,16 +596,16 @@ This work of art is distributed under the following license:
Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) which basically means that

You are free to:
Share — copy and redistribute the material in any medium or format
Adapt — remix, transform, and build upon the material
Share copy and redistribute the material in any medium or format
Adapt remix, transform, and build upon the material
The licensor cannot revoke these freedoms as long as you follow the license terms.

Under the following terms:
Attribution — You must give appropriate credit, provide a link to the license, and indicate if
Attribution You must give appropriate credit, provide a link to the license, and indicate if
changes were made. You may do so in any reasonable manner, but not in any way that suggests the
licensor endorses you or your use.
NonCommercial — You may not use the material for commercial purposes.
ShareAlike — If you remix, transform, or build upon the material, you must distribute your
NonCommercial You may not use the material for commercial purposes.
ShareAlike If you remix, transform, or build upon the material, you must distribute your
contributions under the same license as the original.

Please see the full license here: https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
4 changes: 2 additions & 2 deletions Unosquare.FFME.Windows/Unosquare.FFME.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<Description>FFME is an advanced WPF MediaElement alternative. While the standard MediaElement uses DirectX (DirectShow) for media playback, FFME uses FFmpeg to read and decode audio and video.</Description>
<Copyright>Unosquare SA de CV, Mario Di Vece, and Contributors, (C) 2015-2019</Copyright>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/unosquare/ffmediaelement</PackageProjectUrl>
<PackageIconUrl>https://github.com/unosquare/ffmediaelement/blob/master/ffme.png</PackageIconUrl>
<PackageTags>ffme hls wpf ffmpeg mediaelement h264 h265 hevc audio video decoding playback frame</PackageTags>
Expand All @@ -45,7 +45,7 @@

<ItemGroup>
<None Include="$(SolutionDir)\Support\readme.txt" Pack="true" PackagePath="" />
<None Include="$(SolutionDir)\LICENSE.md" Pack="true" PackagePath="" />
<None Include="$(SolutionDir)\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Unosquare.FFME.sln
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Support", "Support", "{8BF2
docfx.json = docfx.json
Support\ffme.png = Support\ffme.png
Support\ffmeplay.png = Support\ffmeplay.png
LICENSE.md = LICENSE.md
LICENSE = LICENSE
README.md = README.md
Support\readme.txt = Support\readme.txt
toc.yml = toc.yml
Expand Down

0 comments on commit 9bf03d7

Please sign in to comment.