diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /DOCS/xml/en/codecs.xml | |
parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'DOCS/xml/en/codecs.xml')
-rw-r--r-- | DOCS/xml/en/codecs.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 36f4a2e0e9..909efa2ef9 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -97,8 +97,8 @@ supported in <application>MEncoder</application>. <para> For a complete list of supported -<ulink url="http://ffmpeg.org/ffmpeg-doc.html#SEC19">video</ulink> -and <ulink url="http://ffmpeg.org/ffmpeg-doc.html#SEC20">audio</ulink> +<ulink url="http://ffmpeg.mplayerhq.hu/general.html#SEC6">video</ulink> +and <ulink url="http://ffmpeg.mplayerhq.hu/general.html#SEC7">audio</ulink> codecs please visit the FFmpeg homepage. </para> |