diff from 225915 and 77147

Description: Tools for transcoding, streaming and playing of multimedia files
 FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
 mux, demux, stream, filter and play pretty much anything that humans and
 machines have created. It supports the most obscure ancient formats up to the
 cutting edge.
 .
 This package contains:
  * ffmpeg: a command line tool to convert multimedia files between formats
  * ffserver: a multimedia streaming server for live broadcasts
  * ffplay: a simple media player based on SDL and the FFmpeg libraries
  * ffprobe: a simple multimedia stream analyzer
 .
 NOTE: It does not contain qt-faststart to avoid a conflict with libav-tools.
       If you need qt-faststart from FFmpeg, install the package qt-faststart,
       which is recommended by this package.

Description: Multimedia player, server, encoder and transcoder
 This package contains the ffplay multimedia player, the ffserver streaming
 server and the ffmpeg audio and video encoder. They support most existing
 file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
 DivX, MPEG4, AC3, DV...).

--- 225915	Thu Jan  1 00:00:00 1970
+++ 77147	Thu Jan  1 00:00:00 1970
@@ -1,15 +1,5 @@
-Tools for transcoding, streaming and playing of multimedia files
+Multimedia player, server, encoder and transcoder
- FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
+ This package contains the ffplay multimedia player, the ffserver streaming
- mux, demux, stream, filter and play pretty much anything that humans and
+ server and the ffmpeg audio and video encoder. They support most existing
- machines have created. It supports the most obscure ancient formats up to the
+ file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
- cutting edge.
+ DivX, MPEG4, AC3, DV...).
- .
- This package contains:
-  * ffmpeg: a command line tool to convert multimedia files between formats
-  * ffserver: a multimedia streaming server for live broadcasts
-  * ffplay: a simple media player based on SDL and the FFmpeg libraries
-  * ffprobe: a simple multimedia stream analyzer
- .
- NOTE: It does not contain qt-faststart to avoid a conflict with libav-tools.
-       If you need qt-faststart from FFmpeg, install the package qt-faststart,
-       which is recommended by this package.