# HG changeset patch
# User gpoirier
# Date 1127772894 0
# Node ID 7a06ad5c5b2c709083a1fbbc89ef0cfe514c1be2
# Parent  58adc79e3febed2cfa066938f53b40e8c7a62ee0
the "psnr" option doesn't really need to be in the encoding setting examples.

diff -r 58adc79e3feb -r 7a06ad5c5b2c DOCS/xml/en/encoding-guide.xml
--- a/DOCS/xml/en/encoding-guide.xml	Mon Sep 26 21:56:13 2005 +0000
+++ b/DOCS/xml/en/encoding-guide.xml	Mon Sep 26 22:14:54 2005 +0000
@@ -2541,19 +2541,19 @@
 </row>
 <row>
   <entry>High quality</entry>
-  <entry><option>vcodec=mpeg4:mbd=2:trell:v4mv:last_pred=2:dia=-1:vmax_b_frames=2:vb_strategy=1:cmp=3:subcmp=3:precmp=0:vqcomp=0.6:turbo:psnr</option></entry>
+  <entry><option>vcodec=mpeg4:mbd=2:trell:v4mv:last_pred=2:dia=-1:vmax_b_frames=2:vb_strategy=1:cmp=3:subcmp=3:precmp=0:vqcomp=0.6:turbo</option></entry>
   <entry>15fps</entry>
   <entry>-0.5dB</entry>
 </row>
 <row>
   <entry>Fast</entry>
-  <entry><option>vcodec=mpeg4:mbd=2:trell:v4mv:turbo:psnr</option></entry>
+  <entry><option>vcodec=mpeg4:mbd=2:trell:v4mv:turbo</option></entry>
   <entry>42fps</entry>
   <entry>-0.74dB</entry>
 </row>
 <row>
   <entry>Realtime</entry>
-  <entry><option>vcodec=mpeg4:mbd=2:turbo:psnr</option></entry>
+  <entry><option>vcodec=mpeg4:mbd=2:turbo</option></entry>
   <entry>54fps</entry>
   <entry>-1.21dB</entry>
 </row>
@@ -3277,19 +3277,19 @@
 </row>
 <row>
   <entry>High quality</entry>
-  <entry><option>vhq=2:bvhq=1:psnr:chroma_opt:quant_type=mpeg:psnr</option></entry>
+  <entry><option>vhq=2:bvhq=1:chroma_opt:quant_type=mpeg</option></entry>
   <entry>18fps</entry>
   <entry>-0.1dB</entry>
 </row>
 <row>
   <entry>Fast</entry>
-  <entry><option>turbo:vhq=0:psnr</option></entry>
+  <entry><option>turbo:vhq=0</option></entry>
   <entry>28fps</entry>
   <entry>-0.69dB</entry>
 </row>
 <row>
   <entry>Realtime</entry>
-  <entry><option>turbo:nochroma_me:notrellis:max_bframes=0:vhq=0:psnr</option></entry>
+  <entry><option>turbo:nochroma_me:notrellis:max_bframes=0:vhq=0</option></entry>
   <entry>38fps</entry>
   <entry>-1.48dB</entry>
 </row>
@@ -3799,13 +3799,13 @@
 </row>
 <row>
   <entry>High quality</entry>
-  <entry><option>subq=5:4x4mv:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b:psnr</option></entry>
+  <entry><option>subq=5:4x4mv:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
   <entry>13fps</entry>
   <entry>-0.89dB</entry>
 </row>
 <row>
   <entry>Fast</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b:psnr</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
   <entry>17fps</entry>
   <entry>-1.48dB</entry>
 </row>