diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
| commit | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch) | |
| tree | eabf4399e40fd270714c53d40688eadadfd4c5ff /DOCS/man | |
| parent | f394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff) | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2 mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz | |
Merge svn changes up to r29532
Diffstat (limited to 'DOCS/man')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | DOCS/man/zh_CN/mplayer.1 | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 0d8ac1a73a..dc7a65febd 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7809,10 +7809,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/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 |