X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=README;h=b99967dc9f637fb620842f6afff36c2993741920;hb=9822564d1d66d9202bfec3fa78a93243963768dc;hp=4ae288ece9a11029920899e2ce8ff842b2dbdbc3;hpb=85f07f223de9fbeb2b9d66db11f89091ac717926;p=ffmpeg

diff --git a/README b/README
index 4ae288ece9a..b99967dc9f6 100644
--- a/README
+++ b/README
@@ -1,73 +1,28 @@
-FFmpeg - (c) 2000,2001 Gerard Lantau.
+FFmpeg README
+-------------
 
-1) Introduction
----------------
-
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming
-server and a generic audio and video file converter. 
-
-It can grab from a standard Video4Linux video source and convert it
-into several file formats based on DCT/motion compensation
-encoding. Sound is compressed in MPEG audio layer 2 or using an AC3
-compatible stream.
-
-What makes ffmpeg interesting ?
-
-- Innovative streaming technology : multiformat, real time encoding,
-  simple configuration.
-
-- Simple and efficient video encoder: outputs MPEG1, H263, Real
-  Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
-  same encoder core.
-
-- Real time encoding (25 fps in 352x288 on a K6 500) using the
-  video4linux API.
-
-- Generates I and P frames, which means it is far better than a MJPEG
-  encoder.
-
-- Hyper fast MPEG audio layer 2 compression (50 times faster than
-  realtime on a K6 500).
-
-- Hyper fast AC3 compatible encoder.
-
-- simple and very small portable C source code, easy to understand and
-  to modify. It be may the smallest decent MPEG encoder :-)
-
-- optional non real time higher quality encoding (different motion
-  estimators available).
-
-- Audio and Video decoders are in development.
-
-ffmpeg is made of two programs:
-
-* ffmpeg: soft VCR which encodes in real time to several formats. It
-  can also encode from any supported input file format to any input
-  supported format.
-
-* ffserver: high performance live broadcast streaming server based on
-  the ffmpeg core encoders.
-
-2) Documentation
+1) Documentation
 ----------------
 
-* Read doc/ffmpeg.txt and doc/ffserver.txt to learn the basic features.
+* Read the documentation in the doc/ directory.
 
-* Read doc/TODO to know what are the know bugs and missing features.
+2) Licensing
+------------
 
-* Read doc/README.dev if you want to contribute or use the codec or
-  format libraries.
+* Read the file COPYING.LGPL. FFmpeg and the associated libraries EXCEPT
+  for libpostproc and libswscale are licensed under the GNU Lesser General
+  Public License.
 
-3) Licensing:
-------------
+* libpostproc and libswscale are distributed under the GNU General Public
+  License, see the file COPYING.GPL for details. Their compilation and use
+  in FFmpeg is optional.
 
-* See the file COPYING. ffmpeg and the associated library are licensed
-  under the GNU General Public License. I may change the license of
-  libavcodec and libav to LGPL if many people ask it (and if they
-  submit good patches!).
+* 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.
 
-* This code should be patent free since it is very simple. I took care
-  to use the same video encoder/decoder core for all formats to show
-  that they really ARE THE SAME except for the encoding huffman codes.
+* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
+  are taken from libjpeg, see the top of the files for licensing details.
 
-Gerard Lantau (glantau@yahoo.fr).
+* The file libavcodec/fdctref.c is copyrighted by the MPEG Software Simulation
+  Group with all rights reserved. It is only used to create a DCT test program
+  and not compiled into libavcodec.