[SCM] gmerlin/master: Fixed even more errors in manpages

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Jul 2 15:49:13 UTC 2014


The following commit has been merged in the master branch:
commit 2eee9fd849366c3117f98bfd19b0bb0b36f06f63
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jul 2 17:47:06 2014 +0200

    Fixed even more errors in manpages

diff --git a/debian/gmerlin_kbd.1 b/debian/gmerlin_kbd.1
index a904f32..881c297 100644
--- a/debian/gmerlin_kbd.1
+++ b/debian/gmerlin_kbd.1
@@ -9,7 +9,12 @@ keyboard shortcut daemon
 .B gmerlin_kbd_config
 
 .SH DESCRIPTION
-The gmerlin keyboard daemon is an X11 application, which grabs key combinations and executes commands. You will communicate mostly via the configuration utility gmerlin_kbd_config. It's independent of keyboard model definitions, because it allows to enter the keyboard combination in the config dialog directly. It's independent of gmerlin or any other multimedia architecture, since the actions can be arbitrary shell commands. 
+The gmerlin keyboard daemon is an X11 application, which grabs key combinations
+and executes commands. You will communicate mostly via the configuration utility
+gmerlin_kbd_config. It's independent of keyboard model definitions, because it
+allows one to enter the keyboard combination in the config dialog directly. It's
+independent of gmerlin or any other multimedia architecture, since the actions
+can be arbitrary shell commands.
 
 For more information install the gmerlin-doc package and see
 .B file:///usr/share/doc/gmerlin-doc/userguide/Keyboard-daemon.html
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 2819bcf..6d57ba5 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -21,7 +21,7 @@ Origin: Debian
  .SH SYNOPSIS
  .B gmerlin_transcoder 
  .I [options]
-@@ -10,7 +10,7 @@ GTK multimedia transcoder
+@@ -10,7 +10,7 @@
  
  .SH OPTIONS
  
@@ -30,7 +30,7 @@ Origin: Debian
  .I <file>
  
  .RS 2
-@@ -20,25 +20,25 @@ Load a profile from the given file
+@@ -20,25 +20,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  
@@ -70,7 +70,7 @@ Origin: Debian
  .SH SYNOPSIS
  .B gmerlin_transcoder_remote 
  .I [options]
-@@ -11,21 +11,21 @@ Remote control command for the Gmerlin G
+@@ -11,21 +11,21 @@
  
  .SH GLOBAL OPTIONS
  
@@ -95,7 +95,7 @@ Origin: Debian
  
  .RS 2
  Launch new transcoder if necessary
-@@ -33,14 +33,14 @@ Launch new transcoder if necessary
+@@ -33,14 +33,14 @@
  
  .SH COMMANDS
  
@@ -112,7 +112,7 @@ Origin: Debian
  .I <location>
  
  .RS 2
-@@ -50,25 +50,25 @@ Add <location> to the track list
+@@ -50,25 +50,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  
@@ -152,7 +152,7 @@ Origin: Debian
  .SH SYNOPSIS
  .B gmerlin 
  .I [options]
-@@ -12,25 +12,25 @@ Gmerlin GUI Player
+@@ -12,25 +12,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  
@@ -192,7 +192,7 @@ Origin: Debian
  .SH SYNOPSIS
  .B gmerlin_remote 
  .I [options]
-@@ -11,21 +11,21 @@ Remote control command for the Gmerlin G
+@@ -11,21 +11,21 @@
  
  .SH GLOBAL OPTIONS
  
@@ -217,7 +217,7 @@ Origin: Debian
  
  .RS 2
  Launch new player if necessary
-@@ -33,64 +33,64 @@ Launch new player if necessary
+@@ -33,64 +33,64 @@
  
  .SH COMMANDS
  
@@ -292,7 +292,7 @@ Origin: Debian
  .I <device>
  
  .RS 2
-@@ -98,48 +98,48 @@ Open album for <device> and play first t
+@@ -98,48 +98,48 @@
  dvd:///dev/hdd).
  .RE
  
@@ -351,7 +351,7 @@ Origin: Debian
  
  .RS 2
  Print time of the current track
-@@ -148,25 +148,25 @@ Print time of the current track
+@@ -148,25 +148,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  
@@ -391,7 +391,7 @@ Origin: Debian
  .SH SYNOPSIS
  .B gmerlin_player 
  .I [options]
-@@ -11,7 +11,7 @@ Commandline Multimedia player
+@@ -11,7 +11,7 @@
  
  .SH OPTIONS
  
@@ -400,7 +400,7 @@ Origin: Debian
  .I <audio_output_options>
  
  .RS 2
-@@ -128,7 +128,7 @@ Host (empty: local)
+@@ -128,7 +128,7 @@
  .RE
  .RE
  
@@ -409,7 +409,7 @@ Origin: Debian
  .I <video_output_options>
  
  .RS 2
-@@ -230,7 +230,7 @@ Window ID
+@@ -230,7 +230,7 @@
  .P
  .RE
  
@@ -418,7 +418,7 @@ Origin: Debian
  .I <input_plugin>
  
  .RS 2
-@@ -249,7 +249,7 @@ input plugin
+@@ -249,7 +249,7 @@
  
  .P
  .RS 2
@@ -427,7 +427,7 @@ Origin: Debian
  .P
  Trackname template
  .P
-@@ -258,16 +258,16 @@ Template for track name generation from
+@@ -258,16 +258,16 @@
  %a:    Album
  %g:    Genre
  %t:    Track name
@@ -447,7 +447,7 @@ Origin: Debian
  
  .P
  .BR use_local "=[1|0] (default: 1)"
-@@ -384,7 +384,7 @@ Disable all data verification and correc
+@@ -384,7 +384,7 @@
  .P
  Disable extra paranoia
  .P
@@ -456,7 +456,7 @@ Origin: Debian
  boundaries is performed. It can wedge if errors  occur  in the attempted
  overlap area. Not recommended.
  
-@@ -415,7 +415,7 @@ postprocessing, 1 means maximum postproc
+@@ -415,7 +415,7 @@
  Shrink factor
  .P
  This enables downscaling of images while decoding. Currently only
@@ -465,7 +465,7 @@ Origin: Debian
  
  .P
  .BR vdpau "=[1|0] (default: 1)"
-@@ -488,7 +488,7 @@ Port base for RTP
+@@ -488,7 +488,7 @@
  Port base for RTP over UDP. Values of 1024 or smaller enable random
  ports (recommended for RTSP aware firewalls). Values larger than 1024
  define the base port. 2 consecutive ports are used for each A/V stream,
@@ -474,7 +474,7 @@ Origin: Debian
  the next even value.
  
  .P
-@@ -524,7 +524,7 @@ Default subtitle encoding
+@@ -524,7 +524,7 @@
  .P
  This sets the default encoding for text subtitles,when the original
  encoding is unknown. It must be a character set namerecognized by iconv.
@@ -483,7 +483,7 @@ Origin: Debian
  
  .P
  .BR sample_accuracy "=<string>"
-@@ -891,7 +891,7 @@ Use interpolate mixing
+@@ -891,7 +891,7 @@
  .RE
  .RE
  
@@ -492,7 +492,7 @@ Origin: Debian
  .I <audio_options>
  
  .RS 2
-@@ -1001,7 +1001,7 @@ Mix mode when downmixing Stereo to Mono.
+@@ -1001,7 +1001,7 @@
  .P
  .RE
  
@@ -501,7 +501,7 @@ Origin: Debian
  .I <video_options>
  
  .RS 2
-@@ -1063,7 +1063,7 @@ restart
+@@ -1063,7 +1063,7 @@
  .P
  .RE
  
@@ -510,7 +510,7 @@ Origin: Debian
  .I <input_options>
  
  .RS 2
-@@ -1078,7 +1078,7 @@ When showing still images, gmerlin repea
+@@ -1078,7 +1078,7 @@
  realtime filter tweaking work.
  
  .P
@@ -519,7 +519,7 @@ Origin: Debian
  .P
  Sync offset [ms]
  .P
-@@ -1088,7 +1088,7 @@ and video. Use positive values if the vi
+@@ -1088,7 +1088,7 @@
  .P
  .RE
  
@@ -528,7 +528,7 @@ Origin: Debian
  .I <osd_options>
  
  .RS 2
-@@ -1173,27 +1173,27 @@ Duration (milliseconds)
+@@ -1173,27 +1173,27 @@
  .P
  .RE
  
@@ -560,7 +560,7 @@ Origin: Debian
  .I <track_spec>
  
  .RS 2
-@@ -1203,25 +1203,25 @@ Set verbosity level (0..4)
+@@ -1203,25 +1203,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  
@@ -592,7 +592,7 @@ Origin: Debian
  Print version info and exit
 --- gmerlin.orig/lib/cmdline.c
 +++ gmerlin/lib/cmdline.c
-@@ -383,7 +383,7 @@ void bg_cmdline_print_help(char * argv0,
+@@ -383,7 +383,7 @@
  
        free(string_uc);
  
@@ -615,7 +615,7 @@ Origin: Debian
  .I [options]
  
  .SH DESCRIPTION
-@@ -10,7 +10,7 @@ Commandline recorder
+@@ -10,7 +10,7 @@
  
  .SH OPTIONS
  
@@ -624,61 +624,329 @@ Origin: Debian
  .I <audio_options>
  
  .RS 2
-@@ -12573,7 +12573,7 @@ reference software
+@@ -1831,7 +1831,7 @@
+ .P
+ .BR Output select (-1 = key listen, 0 = gate, 1 = bypass) "=<number> (-1..1, default: -90)"
+ .P
+-Output select (-1 = key listen, 0 = gate, 1 = bypass)
++Output select (\-1 = key listen, 0 = gate, 1 = bypass)
+ .P
+ .BR $run_adding "=[1|0] (default: 0)"
+ .P
+@@ -8615,11 +8615,11 @@
+ .P
+ .BR vorbis_max_bitrate "=<number> (default: -1)"
+ .P
+-Maximum Bitrate (-1 = no limit)
++Maximum Bitrate (\-1 = no limit)
+ .P
+ .BR vorbis_min_bitrate "=<number> (default: -1)"
+ .P
+-Minimum Bitrate (-1 = no limit)
++Minimum Bitrate (\-1 = no limit)
+ .P
+ .RE
+ .B Suboptions for codec=vorbis_qt
+@@ -8636,11 +8636,11 @@
+ .P
+ .BR vorbis_max_bitrate "=<number> (default: -1)"
+ .P
+-Maximum Bitrate (-1 = no limit)
++Maximum Bitrate (\-1 = no limit)
+ .P
+ .BR vorbis_min_bitrate "=<number> (default: -1)"
+ .P
+-Minimum Bitrate (-1 = no limit)
++Minimum Bitrate (\-1 = no limit)
+ .P
+ .RE
+ .B Suboptions for codec=ffmpeg_mp2
+@@ -9006,7 +9006,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ 
+ .P
+@@ -9032,7 +9032,7 @@
+ if > 0 then the last p frame quantizer will be used (q=
+ lastp_q*factor+offset)
+  if < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ 
+ .P
+@@ -9288,8 +9288,8 @@
+  1: Strictly conform to all the things in the spec no  matter what
+ consequences
+  0: Default
+- -1: Allow unofficial extensions
+- -2: Allow non standarized experimental things
++ \-1: Allow unofficial extensions
++ \-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -9459,7 +9459,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ 
+ .P
+@@ -9644,8 +9644,8 @@
+  1: Strictly conform to all the things in the spec no  matter what
+ consequences
+  0: Default
+- -1: Allow unofficial extensions
+- -2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -9815,7 +9815,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ 
+ .P
+@@ -10000,8 +10000,8 @@
+  1: Strictly conform to all the things in the spec no  matter what
+ consequences
+  0: Default
+- -1: Allow unofficial extensions
+- -2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -10171,7 +10171,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ 
+ .P
+@@ -10365,8 +10365,8 @@
+  1: Strictly conform to all the things in the spec no  matter what
+ consequences
+  0: Default
+- -1: Allow unofficial extensions
+- -2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -10544,7 +10544,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ 
+ .P
+@@ -10738,8 +10738,8 @@
+  1: Strictly conform to all the things in the spec no  matter what
+ consequences
+  0: Default
+- -1: Allow unofficial extensions
+- -2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -10952,8 +10952,8 @@
+  1: Strictly conform to all the things in the spec no  matter what
+ consequences
+  0: Default
+- -1: Allow unofficial extensions
+- -2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -12372,7 +12372,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_i_quant_offset "=<number> (0.0..31.0, default: 0.0)"
+@@ -12397,7 +12397,7 @@
+ if > 0 then the last p frame quantizer will be used (q=
+ lastp_q*factor+offset)
+ if < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_me_method "=<string>"
+@@ -12573,8 +12573,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
 --1: Allow inofficial extensions
-+-1: Allow unofficial extensions
- -2: Allow non standarized experimental things
+--2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -12748,7 +12748,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_i_quant_offset "=<number> (0.0..31.0, default: 0.0)"
+@@ -12773,7 +12773,7 @@
+ if > 0 then the last p frame quantizer will be used (q=
+ lastp_q*factor+offset)
+ if < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
  
  .P
-@@ -12949,7 +12949,7 @@ reference software
+ .BR ff_me_method "=<string>"
+@@ -12949,8 +12949,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
 --1: Allow inofficial extensions
-+-1: Allow unofficial extensions
- -2: Allow non standarized experimental things
+--2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -13238,7 +13238,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_i_quant_offset "=<number> (0.0..31.0, default: 0.0)"
+@@ -13263,7 +13263,7 @@
+ if > 0 then the last p frame quantizer will be used (q=
+ lastp_q*factor+offset)
+ if < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
  
  .P
-@@ -13515,7 +13515,7 @@ reference software
+ .BR ff_flag_cbp_rd "=[1|0] (default: 0)"
+@@ -13515,8 +13515,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
 --1: Allow inofficial extensions
-+-1: Allow unofficial extensions
- -2: Allow non standarized experimental things
+--2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
  
  .P
-@@ -13862,7 +13862,7 @@ reference software
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -13679,7 +13679,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_i_quant_offset "=<number> (0.0..31.0, default: 0.0)"
+@@ -13862,8 +13862,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
 --1: Allow inofficial extensions
-+-1: Allow unofficial extensions
- -2: Allow non standarized experimental things
+--2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
  
  .P
-@@ -14000,7 +14000,7 @@ reference software
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -14000,8 +14000,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
 --1: Allow inofficial extensions
-+-1: Allow unofficial extensions
- -2: Allow non standarized experimental things
+--2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
+ 
+ .P
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -14175,7 +14175,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
  
  .P
-@@ -14376,7 +14376,7 @@ reference software
+ .BR ff_i_quant_offset "=<number> (0.0..31.0, default: 0.0)"
+@@ -14200,7 +14200,7 @@
+ if > 0 then the last p frame quantizer will be used (q=
+ lastp_q*factor+offset)
+ if < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_me_method "=<string>"
+@@ -14376,8 +14376,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
 --1: Allow inofficial extensions
-+-1: Allow unofficial extensions
- -2: Allow non standarized experimental things
+--2: Allow non standarized experimental things
++\-1: Allow unofficial extensions
++\-2: Allow non standarized experimental things
  
  .P
-@@ -14743,7 +14743,7 @@ When using masking, try to adjust the pe
+ .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
+@@ -14551,7 +14551,7 @@
+ If > 0 then the last P frame quantizer will be used (q=
+ lastp_q*factor+offset).
+ If < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_i_quant_offset "=<number> (0.0..31.0, default: 0.0)"
+@@ -14576,7 +14576,7 @@
+ if > 0 then the last p frame quantizer will be used (q=
+ lastp_q*factor+offset)
+ if < 0 then normal ratecontrol will be done (q=
+--normal_q*factor+offset)
++\-normal_q*factor+offset)
+ 
+ .P
+ .BR ff_me_method "=<string>"
+@@ -14743,7 +14743,7 @@
  maintain the desired average
  
  .P
@@ -687,7 +955,7 @@ Origin: Debian
  .P
  Standards compliance
  .P
-@@ -14752,8 +14752,8 @@ reference software
+@@ -14752,8 +14752,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
@@ -698,7 +966,7 @@ Origin: Debian
  
  .P
  .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
-@@ -14780,7 +14780,7 @@ Use only bitexact stuff (except (i)dct)
+@@ -14780,7 +14780,7 @@
  .P
  GOP size (0 = intra only)
  .P
@@ -707,7 +975,7 @@ Origin: Debian
  .P
  Scenechange threshold
  .P
-@@ -14898,7 +14898,7 @@ Amount of qscale smoothing over time
+@@ -14898,7 +14898,7 @@
  Quantizer noise shaping
  .P
  Choose quantization such that noise will be masked by
@@ -716,7 +984,7 @@ Origin: Debian
  
  .P
  .BR ff_trellis "=[1|0] (default: 0)"
-@@ -14908,22 +14908,22 @@ Use trellis quantization
+@@ -14908,22 +14908,22 @@
  Use trellis quantization (improves quality)
  
  .P
@@ -743,7 +1011,7 @@ Origin: Debian
  
  .P
  .BR ff_me_method "=<string>"
-@@ -14982,7 +14982,7 @@ Default: Use compare function
+@@ -14982,7 +14982,7 @@
  .P
  MB decision mode
  .P
@@ -752,7 +1020,7 @@ Origin: Debian
  .P
  ME diamond size & shape
  .P
-@@ -14991,11 +14991,11 @@ Motion estimation diamond size. Negative
+@@ -14991,11 +14991,11 @@
  .P
  .BR ff_pre_me "=<number> (0..2, default: 0)"
  .P
@@ -767,7 +1035,7 @@ Origin: Debian
  2: always
  
  .P
-@@ -15005,9 +15005,9 @@ Supported strings: SAD SSE SATD DCT PSNR
+@@ -15005,9 +15005,9 @@
  .P
  Default: SAD
  .P
@@ -779,7 +1047,7 @@ Origin: Debian
  SAD: Sum of absolute differences
  SSE: Sum of squared errors
  SATD: Sum of absolute Hadamard transformed differences
-@@ -15023,13 +15023,13 @@ NSSE: Noise preserving sum of squared di
+@@ -15023,13 +15023,13 @@
  .P
  .BR ff_me_pre_cmp_chroma "=[1|0] (default: 0)"
  .P
@@ -797,7 +1065,7 @@ Origin: Debian
  adaptive.
  
  .P
-@@ -15038,7 +15038,7 @@ adaptive.
+@@ -15038,7 +15038,7 @@
  Luminance masking
  .P
  Encode very bright image parts with reduced quality. 0 means
@@ -806,7 +1074,7 @@ Origin: Debian
  
  .P
  .BR ff_dark_masking "=<number> (0.00..1.00, default: 0.00)"
-@@ -15046,7 +15046,7 @@ disabled, 0-0.3 is a sane range.
+@@ -15046,7 +15046,7 @@
  Darkness masking
  .P
  Encode very dark image parts with reduced quality. 0 means disabled,
@@ -815,7 +1083,7 @@ Origin: Debian
  
  .P
  .BR ff_temporal_cplx_masking "=<number> (0.00..1.00, default: 0.00)"
-@@ -15062,7 +15062,7 @@ disabled.
+@@ -15062,7 +15062,7 @@
  Spatial complexity masking
  .P
  Encode very complex image parts with reduced quality. 0 means
@@ -824,7 +1092,7 @@ Origin: Debian
  
  .P
  .BR ff_border_masking "=<number> (0.00..1.00, default: 0.00)"
-@@ -15090,7 +15090,7 @@ When using masking, try to adjust the pe
+@@ -15090,7 +15090,7 @@
  maintain the desired average
  
  .P
@@ -833,7 +1101,7 @@ Origin: Debian
  .P
  Standards compliance
  .P
-@@ -15099,8 +15099,8 @@ reference software
+@@ -15099,8 +15099,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
@@ -844,7 +1112,7 @@ Origin: Debian
  
  .P
  .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
-@@ -15127,7 +15127,7 @@ Use only bitexact stuff (except (i)dct)
+@@ -15127,7 +15127,7 @@
  .P
  GOP size (0 = intra only)
  .P
@@ -853,7 +1121,7 @@ Origin: Debian
  .P
  Scenechange threshold
  .P
-@@ -15245,7 +15245,7 @@ Amount of qscale smoothing over time
+@@ -15245,7 +15245,7 @@
  Quantizer noise shaping
  .P
  Choose quantization such that noise will be masked by
@@ -862,7 +1130,7 @@ Origin: Debian
  
  .P
  .BR ff_trellis "=[1|0] (default: 0)"
-@@ -15255,22 +15255,22 @@ Use trellis quantization
+@@ -15255,22 +15255,22 @@
  Use trellis quantization (improves quality)
  
  .P
@@ -889,7 +1157,7 @@ Origin: Debian
  
  .P
  .BR ff_me_method "=<string>"
-@@ -15329,7 +15329,7 @@ Default: Use compare function
+@@ -15329,7 +15329,7 @@
  .P
  MB decision mode
  .P
@@ -898,7 +1166,7 @@ Origin: Debian
  .P
  ME diamond size & shape
  .P
-@@ -15338,11 +15338,11 @@ Motion estimation diamond size. Negative
+@@ -15338,11 +15338,11 @@
  .P
  .BR ff_pre_me "=<number> (0..2, default: 0)"
  .P
@@ -913,7 +1181,7 @@ Origin: Debian
  2: always
  
  .P
-@@ -15352,9 +15352,9 @@ Supported strings: SAD SSE SATD DCT PSNR
+@@ -15352,9 +15352,9 @@
  .P
  Default: SAD
  .P
@@ -925,7 +1193,7 @@ Origin: Debian
  SAD: Sum of absolute differences
  SSE: Sum of squared errors
  SATD: Sum of absolute Hadamard transformed differences
-@@ -15370,13 +15370,13 @@ NSSE: Noise preserving sum of squared di
+@@ -15370,13 +15370,13 @@
  .P
  .BR ff_me_pre_cmp_chroma "=[1|0] (default: 0)"
  .P
@@ -943,7 +1211,7 @@ Origin: Debian
  adaptive.
  
  .P
-@@ -15385,7 +15385,7 @@ adaptive.
+@@ -15385,7 +15385,7 @@
  Luminance masking
  .P
  Encode very bright image parts with reduced quality. 0 means
@@ -952,7 +1220,7 @@ Origin: Debian
  
  .P
  .BR ff_dark_masking "=<number> (0.00..1.00, default: 0.00)"
-@@ -15393,7 +15393,7 @@ disabled, 0-0.3 is a sane range.
+@@ -15393,7 +15393,7 @@
  Darkness masking
  .P
  Encode very dark image parts with reduced quality. 0 means disabled,
@@ -961,7 +1229,7 @@ Origin: Debian
  
  .P
  .BR ff_temporal_cplx_masking "=<number> (0.00..1.00, default: 0.00)"
-@@ -15409,7 +15409,7 @@ disabled.
+@@ -15409,7 +15409,7 @@
  Spatial complexity masking
  .P
  Encode very complex image parts with reduced quality. 0 means
@@ -970,7 +1238,7 @@ Origin: Debian
  
  .P
  .BR ff_border_masking "=<number> (0.00..1.00, default: 0.00)"
-@@ -15437,7 +15437,7 @@ When using masking, try to adjust the pe
+@@ -15437,7 +15437,7 @@
  maintain the desired average
  
  .P
@@ -979,7 +1247,7 @@ Origin: Debian
  .P
  Standards compliance
  .P
-@@ -15446,8 +15446,8 @@ reference software
+@@ -15446,8 +15446,8 @@
  1: Strictly conform to all the things in the spec no matter what
  consequences
  0: Default
@@ -990,7 +1258,7 @@ Origin: Debian
  
  .P
  .BR ff_noise_reduction "=<number> (0..2000, default: 0)"
-@@ -15631,7 +15631,7 @@ Use voice activity detection
+@@ -15631,7 +15631,7 @@
  .P
  .BR dtx "=[1|0] (default: 0)"
  .P
@@ -999,7 +1267,7 @@ Origin: Debian
  .P
  .RE
  .BR cbr "=[1|0] (default: 0)"
-@@ -15720,7 +15720,7 @@ frame duration here
+@@ -15720,7 +15720,7 @@
  .RE
  .RE
  
@@ -1008,7 +1276,7 @@ Origin: Debian
  .I <output_options>
  
  .RS 2
-@@ -15731,7 +15731,7 @@ Set output options
+@@ -15731,7 +15731,7 @@
  .P
  Output directory
  .P
@@ -1017,7 +1285,7 @@ Origin: Debian
  .P
  Output filename mask
  .P
-@@ -15756,13 +15756,13 @@ Extension is appended by the plugin
+@@ -15756,13 +15756,13 @@
  .P
  .RE
  
@@ -1033,7 +1301,7 @@ Origin: Debian
  .I <name>
  
  .RS 2
-@@ -15772,25 +15772,25 @@ Set log messages to syslog
+@@ -15772,25 +15772,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list