Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

* commit '96ce6d6f119a16e489941c629a2805204322b717':
  doc: Add more information in the README

Conflicts:
	README.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc README.md
index c8da820797476549102aeca8ed4cbd5187389b63,2dc668a24d53859f791b002080a5e8bf64856a8a..182d726f3a8c8679c067b6364be26342aa0f3e00
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -1,19 -1,40 +1,40 @@@
 -Libav
 -=====
 +FFmpeg README
 +=============
  
- 1) Documentation
- ----------------
 -Libav is a collection of libraries and tools to process multimedia content
++FFmpeg is a collection of libraries and tools to process multimedia content
+ such as audio, video, subtitles and related metadata.
  
- * Read the documentation in the doc/ directory in git.
+ ## Libraries
  
-   You can also view it online at http://ffmpeg.org/documentation.html
+ * `libavcodec` provides implementation of a wider range of codecs.
+ * `libavformat` implements streaming protocols, container formats and basic I/O access.
+ * `libavutil` includes hashers, decompressors and miscellaneous utility functions.
+ * `libavfilter` provides a mean to alter decoded Audio and Video through chain of filters.
+ * `libavdevice` provides an abstraction to access capture and playback devices.
 -* `libavresample` implements audio mixing and resampling routines.
++* `libswresample` implements audio mixing and resampling routines.
+ * `libswscale` implements color conversion and scaling routines.
  
- 2) Licensing
- ------------
+ ## Tools
  
- * See the LICENSE file.
 -* [avconv](http://libav.org/avconv.html) is a command line toolbox to
++* [ffmpeg](http://ffmpeg.org/ffmpeg.html) is a command line toolbox to
+   manipulate, convert and stream multimedia content.
 -* [avplay](http://libav.org/avplay.html) is a minimalistic multimedia player.
 -* [avprobe](http://libav.org/avprobe.html) is a simple analisys tool to inspect
++* [ffplay](http://ffmpeg.org/ffplay.html) is a minimalistic multimedia player.
++* [ffprobe](http://ffmpeg.org/ffprobe.html) is a simple analisys tool to inspect
+   multimedia content.
+ * Additional small tools such as `aviocat`, `ismindex` and `qt-faststart`.
  
- 3) Build and Install
- --------------------
+ ## Documentation
  
- * See the INSTALL file.
+ The offline documentation is available in the **doc/** directory.
+ 
 -The online documentation is available in the main [website](http://libav.org)
 -and in the [wiki](http://wiki.libav.org).
++The online documentation is available in the main [website](http://ffmpeg.org)
++and in the [wiki](http://trac.ffmpeg.org).
+ 
+ ### Examples
+ 
+ Conding examples are available in the **doc/example** directory.
+ 
+ ## License
+ 
 -Libav codebase is mainly LGPL-licensed with optional components licensed under
++FFmpeg codebase is mainly LGPL-licensed with optional components licensed under
+ GPL. Please refer to the LICENSE file for detailed information.