summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-03-08 19:24:06 +0000
committerDiego Biurrun <diego@biurrun.de>2008-03-08 19:24:06 +0000
commit72b8963d435436040ecdecabf60dee1dc1a4f81e (patch)
treea708ac89a9b93bdc0989d5754eee80bcea040cf4 /README
parent54b62496811914ec47f4369fa635d169f452fbb7 (diff)
downloadffmpeg-streaming-72b8963d435436040ecdecabf60dee1dc1a4f81e.zip
ffmpeg-streaming-72b8963d435436040ecdecabf60dee1dc1a4f81e.tar.gz
Mention that libavdevice/x11grab.c is GPLed.
Originally committed as revision 12379 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'README')
-rw-r--r--README3
1 files changed, 3 insertions, 0 deletions
diff --git a/README b/README
index b99967d..9134910 100644
--- a/README
+++ b/README
@@ -20,6 +20,9 @@ FFmpeg README
* The file libavcodec/i386/idct_mmx.c is distributed under the GNU General
Public License. It is strictly an optimization and its use is optional.
+* The file libavdevice/x11grab.c is distributed under the GNU General
+ Public License. X11 grabbing is optional.
+
* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
are taken from libjpeg, see the top of the files for licensing details.
OpenPOWER on IntegriCloud