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/containers.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/containers.xml')
-rw-r--r-- | DOCS/xml/en/containers.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/DOCS/xml/en/containers.xml b/DOCS/xml/en/containers.xml index 6d0d736477..f3d4c6d124 100644 --- a/DOCS/xml/en/containers.xml +++ b/DOCS/xml/en/containers.xml @@ -391,7 +391,8 @@ Read more on the <ulink url="http://www.matroska.org/">official site</ulink>. <para> NUT is the container format developed by <application>MPlayer</application> and <application>FFmpeg</application> folks. Both projects support it. -Read more on the <ulink url="http://www.nut.hu/">official site</ulink>. +Read more on the <ulink url="http://www.nut-container.org/">official +site</ulink>. </para> </sect2> |