diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /DOCS/xml/en/codecs.xml | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'DOCS/xml/en/codecs.xml')
| -rw-r--r-- | DOCS/xml/en/codecs.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 6fed5cc4c6..1c4fc2a0bc 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -309,7 +309,7 @@ sources can be gotten with this command: <application>MPlayer</application> sources are updated whenever an <systemitem class="library">x264</systemitem> API change occurs, so it is always suggested to use -<application>MPlayer</application> from GIT as well. +<application>MPlayer</application> from Subversion as well. Perhaps this situation will change when and if an <systemitem class="library">x264</systemitem> "release" occurs. Meanwhile, <systemitem class="library">x264</systemitem> should |