[MPlayer-DOCS] CVS: main/DOCS/xml/en encoding-guide.xml,1.29,1.30

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/DOCS/xml/en
In directory mail:/var2/tmp/cvs-serv19397/en

Modified Files:
	encoding-guide.xml 
Log Message:
fixes the bug #382 http://bugzilla.mplayerhq.hu/show_bug.cgi?id=382


Index: encoding-guide.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/encoding-guide.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- encoding-guide.xml	26 Sep 2005 22:14:54 -0000	1.29
+++ encoding-guide.xml	1 Oct 2005 15:35:11 -0000	1.30
@@ -3868,10 +3868,8 @@
         <entry>9800 kbps</entry>
         <entry>48000 Hz</entry>
         <entry>AC3,PCM</entry>
-        <entry>1536 kbps</entry>
-        <entry>30000/1001, 24000/1001<footnote id="fn-ntsc-framerate"><para>
-            24000/1001 FPS can be achieved with a 3:2 pullup.
-            </para></footnote></entry>
+        <entry>1536 kbps (max)</entry>
+        <entry>30000/1001, 24000/1001</entry>
         <entry>4:3, 16:9 (only for 720x480)</entry>
     </row>
     <row>
@@ -3883,8 +3881,8 @@
         <entry>1856 kbps</entry>
         <entry>48000 Hz</entry>
         <entry>AC3,PCM</entry>
-        <entry>1536 kbps</entry>
-        <entry>30000/1001, 24000/1001<footnoteref linkend='fn-ntsc-framerate'/></entry>
+        <entry>1536 kbps (max)</entry>
+        <entry>30000/1001, 24000/1001</entry>
         <entry>4:3, 16:9</entry>
     </row>
     <row>
@@ -3894,7 +3892,7 @@
         <entry>2600 kbps</entry>
         <entry>44100 Hz</entry>
         <entry>MP2</entry>
-        <entry>384 kbps</entry>
+        <entry>384 kbps (max)</entry>
         <entry>30000/1001</entry>
         <entry>4:3</entry>
     </row>
@@ -3916,7 +3914,7 @@
         <entry>9800 kbps</entry>
         <entry>48000 Hz</entry>
         <entry>MP2,AC3,PCM</entry>
-        <entry>1536 kbps</entry>
+        <entry>1536 kbps (max)</entry>
         <entry>25</entry>
         <entry>4:3, 16:9 (only for 720x576)</entry>
     </row>
@@ -3927,7 +3925,7 @@
         <entry>1856 kbps</entry>
         <entry>48000 Hz</entry>
         <entry>MP2,AC3,PCM</entry>
-        <entry>1536 kbps</entry>
+        <entry>1536 kbps (max)</entry>
         <entry>25</entry>
         <entry>4:3, 16:9</entry>
     </row>
@@ -3938,7 +3936,7 @@
         <entry>2600 kbps</entry>
         <entry>44100 Hz</entry>
         <entry>MP2</entry>
-        <entry>384 kbps</entry>
+        <entry>384 kbps (max)</entry>
         <entry>25</entry>
         <entry>4:3</entry>
     </row>
@@ -3946,7 +3944,7 @@
         <entry>PAL VCD</entry>
         <entry>352x288</entry>
         <entry>MPEG-1</entry>
-        <entry>1150 kbps</entry>
+        <entry>1152 kbps</entry>
         <entry>44100 Hz</entry>
         <entry>MP2</entry>
         <entry>224 kbps</entry>