diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
| commit | fb09531720a4aa2dfa97e5a9a246a453b6278fd2 (patch) | |
| tree | 61525c3a8ddb419d3838a26e488fc3659079bbcd /contrib/ffmpeg/README | |
| parent | 294d01046724e28b7193bcb65bf2a0391b0135b6 (diff) | |
| download | xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.gz xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.bz2 | |
Sync with a more recent version of FFmpeg.
Diffstat (limited to 'contrib/ffmpeg/README')
| -rw-r--r-- | contrib/ffmpeg/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ffmpeg/README b/contrib/ffmpeg/README index ad98fc645..9f905357e 100644 --- a/contrib/ffmpeg/README +++ b/contrib/ffmpeg/README @@ -10,10 +10,10 @@ FFmpeg README ------------ * Read the file COPYING. ffmpeg and the associated libraries EXCEPT - liba52 and libpostproc are licensed under the Lesser GNU General + libpostproc and libswscale are licensed under the GNU Lesser General Public License. -* liba52 and libpostproc are distributed under the GNU General Public +* libpostproc and libswscale are distributed under the GNU General Public License and their compilation and use is optional in ffmpeg. Fabrice Bellard. |