From c2d0c696b2a9c2063177f57dc2acc4dc5950a791 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 28 Oct 2008 23:27:54 +0000 Subject: Remove useless FFmpeg codec section. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27843 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 31 ------------------------------- DOCS/xml/en/documentation.xml | 2 +- DOCS/xml/en/encoding-guide.xml | 4 ++-- DOCS/xml/en/mencoder.xml | 2 +- 4 files changed, 4 insertions(+), 35 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 3a5fb57527..7b6652cc4f 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -22,37 +22,6 @@ and help us add support for it. - -FFmpeg/libavcodec - - -FFmpeg contains -libavcodec, the leading -open source video and audio codec library. It is capable -of decoding most multimedia formats, usually at higher speeds -than the alternatives, and aims to add support for -the rest of them eventually. It is the default decoder for -the majority of codecs that MPlayer -supports. Encoding is also possible for some formats and -supported in MEncoder. - - - -For a complete list of supported -video -and audio -codecs please visit the FFmpeg homepage. - - - -MPlayer contains -libavcodec. -Just run ./configure and compile. - - - - - Xvid diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index 0d808d72a5..01f9b69f95 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -110,7 +110,7 @@ PCM/MP3/VBR MP3 audio. Encoding to all the codecs of FFmpeg's - libavcodec + libavcodec Video encoding from V4L compatible TV tuners diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index a4a9fac526..5cf6d1a474 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -2433,7 +2433,7 @@ duration/location of each type. codec family -libavcodec +libavcodec provides simple encoding to a lot of interesting video and audio formats. You can encode to the following codecs (more or less up to date): @@ -3071,7 +3071,7 @@ and development advancements, you may get very different results. With this feature of -libavcodec +libavcodec you are able to set custom inter (I-frames/keyframes) and intra (P-frames/predicted frames) matrices. It is supported by many of the codecs: mpeg1video and mpeg2video diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml index 4646937345..5180a57d40 100644 --- a/DOCS/xml/en/mencoder.xml +++ b/DOCS/xml/en/mencoder.xml @@ -757,7 +757,7 @@ support this MPEG-4 attribute. This feature can be used only with -libavcodec's +libavcodec's mpeg4 codec. Keep in mind: although MPlayer will correctly play the created file, other players may use the wrong aspect ratio. -- cgit v1.2.3 From 15d59a656b2b78510dbc1db71a2f1b3f53bb92b4 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 28 Oct 2008 23:33:51 +0000 Subject: Move general comments from the video codec section to the top level. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27844 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 7b6652cc4f..a5971c508f 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -3,9 +3,6 @@ Codecs - -Video codecs - The codec status table is a complete list of all supported codecs, regenerated daily. @@ -20,6 +17,9 @@ please read the codec importing HOWTO and help us add support for it. + +Video codecs + -- cgit v1.2.3 From 83287ec4ca4b0e58e045a706b0d65b691b1cf3f0 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 28 Oct 2008 23:46:57 +0000 Subject: Group codec library installation instructions together in a codec installation subsection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27845 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 152 ++++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index a5971c508f..7bf31b0188 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -17,8 +17,8 @@ please read the codec importing HOWTO and help us add support for it. - -Video codecs + +Codec installation @@ -93,6 +93,80 @@ Now rerun ./configure for x264 support. + + + +<systemitem class="library">libmad</systemitem> support + + +libmad +is a multiplatform, integer (internally 24bit PCM) only +MPEG audio decoding library. It does not handle broken files well, and it +sometimes has problems with seeking, but it may perform better on FPU-less +(such as ARM) +platform than mp3lib. + + + +If you have a proper installation of +libmad, +./configure will notice and support for MPEG audio +decoding via libmad will be built +automatically. + + + + + + +AAC codec + + +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. + + + +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 +./configure +cd libfaad +make +make install + + + + + + + +AMR codecs + + +Adaptive Multi-Rate speech codec is used in third generation (3G) mobile +phones. +Reference implementation is available from +The 3rd Generation Partnership Project +(free for private use). +To enable support, download and install support libraries for +AMR-NB and AMR-WB +following the instructions on that page. Recompile MPlayer afterwards. + + + @@ -159,29 +233,6 @@ MPEG decoder cards. - -<systemitem class="library">libmad</systemitem> support - - -libmad -is a multiplatform, integer (internally 24bit PCM) only -MPEG audio decoding library. It does not handle broken files well, and it -sometimes has problems with seeking, but it may perform better on FPU-less -(such as ARM) -platform than mp3lib. - - - -If you have a proper installation of -libmad, -./configure will notice and support for MPEG audio -decoding via libmad will be built -automatically. - - - - - Hardware MPEG audio codec @@ -195,57 +246,6 @@ only white noise). - - - -AAC codec - - -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. - - - -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 -./configure -cd libfaad -make -make install - - - - - - - -AMR codecs - - -Adaptive Multi-Rate speech codec is used in third generation (3G) mobile -phones. -Reference implementation is available from -The 3rd Generation Partnership Project -(free for private use). -To enable support, download and install support libraries for -AMR-NB and AMR-WB -following the instructions on that page. Recompile MPlayer afterwards. - - - -- cgit v1.2.3 From 11a12201fa5abd170396354d71aa1189962501cd Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 28 Oct 2008 23:48:25 +0000 Subject: section title wording fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27846 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 7bf31b0188..7d75722fd1 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -96,7 +96,7 @@ Now rerun ./configure for -<systemitem class="library">libmad</systemitem> support +<systemitem class="library">libmad</systemitem> libmad @@ -119,7 +119,7 @@ automatically. -AAC codec +AAC An open source AAC decoder called FAAD2 is available from @@ -153,7 +153,7 @@ make install -AMR codecs +AMR Adaptive Multi-Rate speech codec is used in third generation (3G) mobile -- cgit v1.2.3 From a8d2b86eba7307bc81f5658f7eab77f679c00077 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 29 Oct 2008 06:33:24 +0000 Subject: Move libmad codec installation section to software requirements. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27847 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 22 ---------------------- DOCS/xml/en/install.xml | 4 ++++ 2 files changed, 4 insertions(+), 22 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 7d75722fd1..bb63a39cc0 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -93,28 +93,6 @@ Now rerun ./configure for x264 support. - - - -<systemitem class="library">libmad</systemitem> - - -libmad -is a multiplatform, integer (internally 24bit PCM) only -MPEG audio decoding library. It does not handle broken files well, and it -sometimes has problems with seeking, but it may perform better on FPU-less -(such as ARM) -platform than mp3lib. - - - -If you have a proper installation of -libmad, -./configure will notice and support for MPEG audio -decoding via libmad will be built -automatically. - - diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 7503bffc43..60447641ab 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -87,6 +87,10 @@ answers. libsmb - optional, for SMB networking support + + libmad + - optional, for for fast integer-only MP3 decoding on FPU-less platforms + -- cgit v1.2.3 From 860fbafb95634ee02fadba4b6b6b07af604f28f5 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 29 Oct 2008 06:34:09 +0000 Subject: zlib is used in many places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27848 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/install.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 60447641ab..8c53dcc9c0 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -70,8 +70,7 @@ answers. necessary for encoding MP3 audio with MEncoder. - zlib - recommended, necessary for compressed - MOV header and PNG support + zlib - recommended, many codecs use it. LIVE555 Streaming Media -- cgit v1.2.3 From af97f644ed6f72ea72a112b3734d61f42149b6a3 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 29 Oct 2008 22:42:34 +0000 Subject: We now require GNU make 3.81. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27850 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/install.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 8c53dcc9c0..1dd915f1cf 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -42,8 +42,7 @@ answers. You don't absolutely need X, some video output drivers work without it. - make - recommended version is - 3.79.x or later. To build the XML documentation you need 3.80. + GNU make 3.81 FreeType - 2.0.9 or later is required -- cgit v1.2.3