Mercurial > mplayer.hg

changeset 20375:141d91000320

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync w/r20361
author gpoirier
date Sun, 22 Oct 2006 19:31:10 +0000
parents 2a9f7347497f
children bac6402e25a2
files DOCS/xml/fr/encoding-guide.xml
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/fr/encoding-guide.xml	Sun Oct 22 19:30:12 2006 +0000
+++ b/DOCS/xml/fr/encoding-guide.xml	Sun Oct 22 19:31:10 2006 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- synced with r20280 -->
+<!-- synced with r20361 -->
 <chapter id="encoding-guide">
 <title>L'encodage avec <application>MEncoder</application></title>
 
@@ -2282,7 +2282,7 @@
   H.263+
   </entry></row>
 <row><entry>mpeg4</entry><entry>
-  ISO standard MPEG-4 (DivX 5, compatible XviD)
+  ISO standard MPEG-4 (DivX, compatible XviD)
   </entry></row>
 <row><entry>msmpeg4</entry><entry>
   pre-standard MPEG-4 variant par MS, v3 (AKA DivX3)