summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-28 23:04:41 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-28 23:04:41 +0000
commit08ec85ba4be2915e6ae9918344b4465de4ad37f5 (patch)
tree6f2edb2accde81df7a32797ef98edc0b00098422 /DOCS
parent61b101497d19e94a33db26dc8c693d206945cf5c (diff)
downloadmpv-08ec85ba4be2915e6ae9918344b4465de4ad37f5.tar.bz2
mpv-08ec85ba4be2915e6ae9918344b4465de4ad37f5.tar.xz
Revert commit r26897.
XviD is the correct spelling of the codec. You can see it written in the codec own documentation and header files. Prefered name capitalization confirmed in conversation with XviD developer (prunedtree). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26915 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/tech/MAINTAINERS2
-rw-r--r--DOCS/tech/encoding-guide.txt2
-rw-r--r--DOCS/tech/encoding-tips.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 96e58a60b2..65e5c2f76f 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -134,7 +134,7 @@ streams:
codec support:
* FFmpeg: Michael Niedermayer
- * Xvid: Ivan Kalvachev
+ * XviD: Ivan Kalvachev
* x264: Loren Merritt
* musepack, speex: Reimar Döffinger
diff --git a/DOCS/tech/encoding-guide.txt b/DOCS/tech/encoding-guide.txt
index 0393bcbb5f..5073c7c89b 100644
--- a/DOCS/tech/encoding-guide.txt
+++ b/DOCS/tech/encoding-guide.txt
@@ -122,7 +122,7 @@ during the first pass. However, sometimes it is beneficial to watch
the first-pass file before beginning the second pass to make sure
nothing went wrong in the encoding.
-Next, an example using Xvid instead of libavcodec:
+Next, an example using XviD instead of libavcodec:
Encoding from an existing AVI file
500 kbit/sec MPEG-4 video
diff --git a/DOCS/tech/encoding-tips.txt b/DOCS/tech/encoding-tips.txt
index 9096f1f84e..9c9e5ddd87 100644
--- a/DOCS/tech/encoding-tips.txt
+++ b/DOCS/tech/encoding-tips.txt
@@ -304,7 +304,7 @@ This way it apeared that the minimum bits per block is ~40, very
good results are with ~50, and everything above 60 is a waste of bandwidth.
And what's actually funny is that it was independent of codec used. The
results were exactly the same, whether I used DIV3 (with tricky nandub's
-magick), ffmpeg odivx, DivX5 on Windows or Xvid.
+magick), ffmpeg odivx, DivX5 on Windows or XviD.
Surprisingly there is one advantage of using nandub-DIV3 for bitrate
starved encoding: ringing almost never apears this way.