diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 057591daba..ad873d4877 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -15,7 +15,7 @@ of our homepage. -If you have a Win32 codec not listed here which is not supported yet, +If you have a Win32 codec which is not supported yet, please read the codec importing HOWTO and help us add support for it. @@ -58,22 +58,8 @@ Just run ./configure and compile. Xvid is a free software MPEG-4 ASP -compliant video codec, which features two pass encoding and full MPEG-4 ASP -support, making it a lot more efficient than the well-known DivX codec. -It yields very good video quality and good performance due to CPU -optimizations for most modern processors. - - - -It began as a forked development of the OpenDivX codec. -This happened when ProjectMayo changed OpenDivX to closed source -DivX4, and the non-ProjectMayo people working on OpenDivX got angry, -then started Xvid. So both projects have the same origin. - - - -Note that Xvid is not necessary to decode Xvid-encoded video. -libavcodec is used by +compliant video codec. Note that Xvid is not necessary to decode Xvid-encoded +video. libavcodec is used by default as it offers better speed. @@ -126,57 +112,27 @@ default as it offers better speed. <systemitem class="library">x264</systemitem> - -What is <systemitem class="library">x264</systemitem>? - x264 -is a library for creating H.264 video streams. -It is not 100% complete, but supports most of H.264's features which impact -quality. -There are also many advanced features in the H.264 specification -which have nothing to do with video quality per se; many of these -are not yet implemented in x264. - - - - - -How can I encode videos using <application>MEncoder</application> - and <systemitem class="library">x264</systemitem>? - - -If you have the GIT client installed, the latest x264 -sources can be gotten with this command: -git clone git://git.videolan.org/x264.git +is a library for creating H.264 video. MPlayer sources are updated whenever an x264 API change occurs, so it is always suggested to use -MPlayer from Subversion as well. -Perhaps this situation will change when and if an -x264 "release" occurs. -Meanwhile, x264 should -be considered a bit unstable, in the sense that its programming -interface is subject to change. +MPlayer from Subversion. -x264 is built and -installed in the standard way: -./configure && make && sudo make install -This installs libx264.a in /usr/local/lib and x264.h is placed in -/usr/local/include. +If you have a GIT client installed, the latest x264 +sources can be gotten with this command: +git clone git://git.videolan.org/x264.git -With the x264 library -and header placed in the standard locations, building -MPlayer with -x264 support is easy. -Just run the standard: -./configure && make && sudo make install -The ./configure script will autodetect that you have -satisfied the requirements for x264. +Then build and install in the standard way: +./configure && make && make install + +Now rerun ./configure for +MPlayer to pick up +x264 support. - @@ -286,21 +242,23 @@ only white noise). AAC codec -AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4 -files. An open source decoder called FAAD is available from -. -MPlayer includes a CVS snapshot of libfaad 2.1 -beta, so you do not need to get it separately. +An open source AAC decoder called FAAD2 is available from +. +MPlayer includes a copy of it in its source tree. +If you want to use the external library instead, install it and pass + to ./configure. -If you use gcc 3.2 which fails to compile our internal FAAD or want to use -the external library for some other reason, download the library from the -download page -and pass -to ./configure. -You do not need all of faad2 to decode AAC files, libfaad is enough. Build -it like this: +FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get +Debian packages from +Christian Marillat, +Mandrake/Mandriva RPMs from the P.L.F +and Fedora RPMs from Livna. + + +If you choose to build from source, you do not need all of FAAD2 to decode +AAC files, libfaad is enough. Build it like this: cd faad2/ sh bootstrap @@ -309,11 +267,6 @@ cd libfaad make make install -Binaries are not available from audiocoding.com, but you can (apt-)get Debian -packages from -Christian Marillat's homepage, -Mandrake/Mandriva RPMs from the P.L.F -and Fedora RPMs from Livna. diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index a5f5d6f8fd..a4a9fac526 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -3815,7 +3815,7 @@ and development advancements, you may get very different results. x264 is a free library for encoding H.264/AVC video streams. Before starting to encode, you need to -set up MEncoder to support it. +set up MEncoder to support it.