From 87f0e2b3a347c1cb9b7d78c0736ce9a9f3e0d784 Mon Sep 17 00:00:00 2001 From: compn Date: Thu, 30 Jul 2009 12:03:42 +0000 Subject: undocumented keyword git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29459 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/codecs.conf.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'DOCS') diff --git a/DOCS/tech/codecs.conf.txt b/DOCS/tech/codecs.conf.txt index 4a949d0fd5..bc24c73030 100644 --- a/DOCS/tech/codecs.conf.txt +++ b/DOCS/tech/codecs.conf.txt @@ -133,6 +133,8 @@ static, query. The flags are defined as follows: Used for some very old DLLs like Indeo 3 and for some XAnim codecs like cinepak. See dr-methods.txt for details on buffer types. +The "in" keyword -- UNDOCUMENTED + Audio Codecs ------------ Here is an example of a rather full-featured audio codec block: -- cgit v1.2.3 From 88410adf68da0aa991e1dfb14f6a2856197566ae Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 30 Jul 2009 20:10:16 +0000 Subject: Update documentation for libamr replacement by OpenCORE in FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29461 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 4 ---- DOCS/xml/en/encoding-guide.xml | 8 -------- DOCS/xml/en/install.xml | 12 ++++-------- 3 files changed, 4 insertions(+), 20 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 01bcc86f75..3db7b6e3d1 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7860,10 +7860,6 @@ Adaptive PCM formats \- see the HTML documentation for details. Free Lossless Audio Codec (FLAC) .IPs "g726\ " G.726 ADPCM -.IPs libamr_nb -3GPP Adaptive Multi-Rate (AMR) narrow-band -.IPs libamr_wb -3GPP Adaptive Multi-Rate (AMR) wide-band .IPs libfaac Advanced Audio Coding (AAC) \- using FAAC .IPs libmp3lame diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index 706b34dbf5..1c7c5909c5 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -2621,14 +2621,6 @@ mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vc g726 G.726 ADPCM - - libamr_nb - 3GPP Adaptive Multi-Rate (AMR) narrow-band - - - libamr_wb - 3GPP Adaptive Multi-Rate (AMR) wide-band - libfaac Advanced Audio Coding (AAC) - using FAAC diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index f8019fe3f9..21de5406bf 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -469,14 +469,10 @@ make install AMR -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. +MPlayer can use the OpenCORE AMR libraries through FFmpeg. +Download the libraries for AMR-NB and AMR-WB from the +opencore-amr +project and install them according to the instructions on that page. -- cgit v1.2.3 From 55c399762f888a021d50d57a88ae0ecb935050ac Mon Sep 17 00:00:00 2001 From: jrash Date: Fri, 31 Jul 2009 13:07:56 +0000 Subject: sync with en/mplayer.1 r29461 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29462 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/zh_CN/mplayer.1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index 874548068e..7e2685146a 100644 --- a/DOCS/man/zh_CN/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 r29413 +.\" sync with en/mplayer.1 r29461 .\" Encoding: UTF-8 .\" Reminder of hard terms which need better/final solution later: .\" /capture; playtree in parent list; colorkey; retrace; desync; downmix; @@ -7360,10 +7360,6 @@ Dolby Digital（AC-3） Free Lossless Audio Codec（FLAC，免费无损音频编解码器） .IPs "g726\ " G.726 ADPCM -.IPs libamr_nb -3GPP的自适应多码率（AMR）窄频段格式 -.IPs libamr_wb -3GPP的自适应多码率（AMR）宽频段格式 .IPs libfaac Advanced Audio Coding（AAC，高级音频编码）——使用FAAC .IPs libmp3lame -- cgit v1.2.3