# HG changeset patch # User diego # Date 1094468101 0 # Node ID cf4c3b32c4d752b69654aa5cca3590f1a2c85c10 # Parent 9f8b314406c290eb4f8caad54c990be8723cb8f3 alphabetical order for lavdopts diff -r 9f8b314406c2 -r cf4c3b32c4d7 DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Mon Sep 06 10:50:19 2004 +0000 +++ b/DOCS/man/en/mplayer.1 Mon Sep 06 10:55:01 2004 +0000 @@ -2911,28 +2911,32 @@ Available options are: .RE .RSs -.IPs ec\ \ \ -error concealment: +.IPs bug= +Manually work around encoder bugs: .RSss -1: Use strong deblock filter for damaged MBs. -.br -2: iterative motion vector (MV) search (slow) -.br -3: all (default) -.REss -.IPs er= -error resilience: -.RSss -.br -0: disabled -.br -1: careful (Should work with broken encoders.) -.br -2: normal (default) (Works with compliant encoders.) -.br -3: aggressive (More checks, but might cause problems even for valid bitstreams.) -.br -4: very aggressive +0: nothing +.br +1: autodetect bugs (default) +.br +2 (msmpeg4v3): some old lavc generated msmpeg4v3 files (no autodetection) +.br +4 (mpeg4): XviD interlacing bug (autodetected if fourcc==XVIX) +.br +8 (mpeg4): UMP4 (autodetected if fourcc==UMP4) +.br +16 (mpeg4): padding bug (autodetected) +.br +32 (mpeg4): illegal vlc bug (autodetected per fourcc) +.br +64 (mpeg4): XviD and DivX qpel bug (autodetected per fourcc/\:version) +.br +128 (mpeg4): old standard qpel (autodetected per fourcc/\:version) +.br +256 (mpeg4): another qpel bug (autodetected per fourcc/\:version) +.br +512 (mpeg4): direct-qpel-blocksize bug (autodetected per fourcc/\:version) +.br +1024 (mpeg4): edge padding bug (autodetected per fourcc/\:version) .REss .IPs debug= debug: @@ -2966,6 +2970,38 @@ .br 0x1000: bugs .REss +.IPs ec\ \ \ +error concealment: +.RSss +1: Use strong deblock filter for damaged MBs. +.br +2: iterative motion vector (MV) search (slow) +.br +3: all (default) +.REss +.IPs er= +error resilience: +.RSss +.br +0: disabled +.br +1: careful (Should work with broken encoders.) +.br +2: normal (default) (Works with compliant encoders.) +.br +3: aggressive (More checks, but might cause problems even for valid bitstreams.) +.br +4: very aggressive +.REss +.IPs gray\ +grayscale only decoding (a bit faster than with color) +.IPs "idct=<0\-99> (see \-lavcopts)" +For best decoding quality use the same idct algorithm for decoding and encoding. +This may come at a price in accuracy, though. +.IPs "sb= (MPEG2 only)" +Skip the given number of macroblock rows at the bottom. +.IPs "st= (MPEG2 only)" +Skip the given number of macroblock rows at the top. .IPs vismv= vismv: .RSss @@ -2978,42 +3014,6 @@ .br 4: visualize backward predicted MVs of B frames .REss -.IPs bug= -Manually work around encoder bugs: -.RSss -0: nothing -.br -1: autodetect bugs (default) -.br -2 (msmpeg4v3): some old lavc generated msmpeg4v3 files (no autodetection) -.br -4 (mpeg4): XviD interlacing bug (autodetected if fourcc==XVIX) -.br -8 (mpeg4): UMP4 (autodetected if fourcc==UMP4) -.br -16 (mpeg4): padding bug (autodetected) -.br -32 (mpeg4): illegal vlc bug (autodetected per fourcc) -.br -64 (mpeg4): XviD and DivX qpel bug (autodetected per fourcc/\:version) -.br -128 (mpeg4): old standard qpel (autodetected per fourcc/\:version) -.br -256 (mpeg4): another qpel bug (autodetected per fourcc/\:version) -.br -512 (mpeg4): direct-qpel-blocksize bug (autodetected per fourcc/\:version) -.br -1024 (mpeg4): edge padding bug (autodetected per fourcc/\:version) -.REss -.IPs "idct=<0\-99> (see \-lavcopts)" -For best decoding quality use the same idct algorithm for decoding and encoding. -This may come at a price in accuracy, though. -.IPs gray\ -grayscale only decoding (a bit faster than with color) -.IPs "sb= (MPEG2 only)" -Skip the given number of macroblock rows at the bottom. -.IPs "st= (MPEG2 only)" -Skip the given number of macroblock rows at the top. .IPs vstats Prints some statistics and stores them in ./vstats_*.log. .RE