[SCM] gmerlin/master: Fix apps/cmdlinerecorder/gmerlin-record.1 as well.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jun 11 15:45:06 UTC 2012
The following commit has been merged in the master branch:
commit 467baf93995d7b084ebf5990054af88ee60abdbb
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jun 11 16:49:04 2012 +0200
Fix apps/cmdlinerecorder/gmerlin-record.1 as well.
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 2938440..0f235ad 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -2,13 +2,14 @@ Description: Improve the manpages provide by upstream.
also make sure that generated manpages provide proper whois section
Origin: Debian
---
- apps/cmdlineplayer/gmerlin_play.1 | 50 ++++++++++++-------------
- apps/player/gmerlin.1 | 10 ++---
- apps/player/gmerlin_remote.1 | 56 ++++++++++++++--------------
- apps/transcoder/gmerlin_transcoder.1 | 12 +++---
- apps/transcoder/gmerlin_transcoder_remote.1 | 20 +++++-----
- lib/cmdline.c | 2 -
- 6 files changed, 75 insertions(+), 75 deletions(-)
+ apps/cmdlineplayer/gmerlin_play.1 | 50 +++++-----
+ apps/cmdlinerecorder/gmerlin-record.1 | 132 ++++++++++++++--------------
+ apps/player/gmerlin.1 | 10 +-
+ apps/player/gmerlin_remote.1 | 56 +++++------
+ apps/transcoder/gmerlin_transcoder.1 | 12 +-
+ apps/transcoder/gmerlin_transcoder_remote.1 | 20 ++--
+ lib/cmdline.c | 2
+ 7 files changed, 141 insertions(+), 141 deletions(-)
--- gmerlin.orig/apps/transcoder/gmerlin_transcoder.1
+++ gmerlin/apps/transcoder/gmerlin_transcoder.1
@@ -600,3 +601,465 @@ Origin: Debian
printf(".SH SYNOPSIS\n.B %s \n", app_data->name);
tmp_string = bg_strdup(NULL,
TRD(app_data->synopsis, app_data->package));
+--- gmerlin.orig/apps/cmdlinerecorder/gmerlin-record.1
++++ gmerlin/apps/cmdlinerecorder/gmerlin-record.1
+@@ -1,8 +1,8 @@
+-.TH GMERLIN-RECORD 1 "March 2012" Gmerlin "User Manuals"
++.TH GMERLIN\-RECORD 1 "March 2012" Gmerlin "User Manuals"
+ .SH NAME
+-gmerlin-record
++gmerlin\-record
+ .SH SYNOPSIS
+-.B gmerlin-record
++.B gmerlin\-record
+ .I [options]
+
+ .SH DESCRIPTION
+@@ -10,7 +10,7 @@ Commandline recorder
+
+ .SH OPTIONS
+
+-.B -aud
++.B \-aud
+ .I <audio_options>
+
+ .RS 2
+@@ -12573,7 +12573,7 @@ reference software
+ 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
+
+ .P
+@@ -12949,7 +12949,7 @@ reference software
+ 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
+
+ .P
+@@ -13515,7 +13515,7 @@ reference software
+ 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
+
+ .P
+@@ -13862,7 +13862,7 @@ reference software
+ 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
+
+ .P
+@@ -14000,7 +14000,7 @@ reference software
+ 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
+
+ .P
+@@ -14376,7 +14376,7 @@ reference software
+ 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
+
+ .P
+@@ -14743,7 +14743,7 @@ When using masking, try to adjust the pe
+ maintain the desired average
+
+ .P
+-.BR ff_strict_std_compliance "=<number> (-2..2, default: 0)"
++.BR ff_strict_std_compliance "=<number> (\-2..2, default: 0)"
+ .P
+ Standards compliance
+ .P
+@@ -14752,8 +14752,8 @@ reference software
+ 1: Strictly conform to all the things in the spec no matter what
+ consequences
+ 0: Default
+--1: Allow inofficial 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)"
+@@ -14780,7 +14780,7 @@ Use only bitexact stuff (except (i)dct)
+ .P
+ GOP size (0 = intra only)
+ .P
+-.BR ff_scenechange_threshold "=<number> (-1000000000..1000000000, default: 0)"
++.BR ff_scenechange_threshold "=<number> (\-1000000000..1000000000, default: 0)"
+ .P
+ Scenechange threshold
+ .P
+@@ -14898,7 +14898,7 @@ Amount of qscale smoothing over time
+ Quantizer noise shaping
+ .P
+ Choose quantization such that noise will be masked by
+-similar-frequency content in the image
++similar\-frequency content in the image
+
+ .P
+ .BR ff_trellis "=[1|0] (default: 0)"
+@@ -14908,22 +14908,22 @@ Use trellis quantization
+ Use trellis quantization (improves quality)
+
+ .P
+-.BR ff_i_quant_factor "=<number> (-31.0..31.0, default: -0.8)"
++.BR ff_i_quant_factor "=<number> (\-31.0..31.0, default: \-0.8)"
+ .P
+ I quantizer factor
+ .P
+-Quantizer factor between P-frames and I-frames.
++Quantizer factor between P\-frames and I\-frames.
+ 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)"
+ .P
+ I quantizer offset
+ .P
+-Quantizer offset between P-frames and I-frames
++Quantizer offset between P\-frames and I\-frames
+
+ .P
+ .BR ff_me_method "=<string>"
+@@ -14982,7 +14982,7 @@ Default: Use compare function
+ .P
+ MB decision mode
+ .P
+-.BR ff_dia_size "=<number> (-9..9, default: 0)"
++.BR ff_dia_size "=<number> (\-9..9, default: 0)"
+ .P
+ ME diamond size & shape
+ .P
+@@ -14991,11 +14991,11 @@ Motion estimation diamond size. Negative
+ .P
+ .BR ff_pre_me "=<number> (0..2, default: 0)"
+ .P
+-ME pre-pass
++ME pre\-pass
+ .P
+-Motion estimation pre-pass
++Motion estimation pre\-pass
+ 0: disabled
+-1: only after I-frames
++1: only after I\-frames
+ 2: always
+
+ .P
+@@ -15005,9 +15005,9 @@ Supported strings: SAD SSE SATD DCT PSNR
+ .P
+ Default: SAD
+ .P
+-ME pre-pass compare function
++ME pre\-pass compare function
+ .P
+-Motion estimation pre-pass compare function.
++Motion estimation pre\-pass compare function.
+ 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
+ .P
+ .BR ff_me_pre_cmp_chroma "=[1|0] (default: 0)"
+ .P
+-Enable chroma ME pre-pass compare
++Enable chroma ME pre\-pass compare
+ .P
+-.BR ff_pre_dia_size "=<number> (-9..9, default: 0)"
++.BR ff_pre_dia_size "=<number> (\-9..9, default: 0)"
+ .P
+-ME pre-pass diamond size & shape
++ME pre\-pass diamond size & shape
+ .P
+-Motion estimation pre-pass diamond size. Negative means shape
++Motion estimation pre\-pass diamond size. Negative means shape
+ adaptive.
+
+ .P
+@@ -15038,7 +15038,7 @@ adaptive.
+ Luminance masking
+ .P
+ Encode very bright image parts with reduced quality. 0 means
+-disabled, 0-0.3 is a sane range.
++disabled, 0\-0.3 is a sane range.
+
+ .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.
+ Darkness masking
+ .P
+ Encode very dark image parts with reduced quality. 0 means disabled,
+-0-0.3 is a sane range.
++0\-0.3 is a sane range.
+
+ .P
+ .BR ff_temporal_cplx_masking "=<number> (0.00..1.00, default: 0.00)"
+@@ -15062,7 +15062,7 @@ disabled.
+ Spatial complexity masking
+ .P
+ Encode very complex image parts with reduced quality. 0 means
+-disabled, 0-0.5 is a sane range.
++disabled, 0\-0.5 is a sane range.
+
+ .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
+ maintain the desired average
+
+ .P
+-.BR ff_strict_std_compliance "=<number> (-2..2, default: 0)"
++.BR ff_strict_std_compliance "=<number> (\-2..2, default: 0)"
+ .P
+ Standards compliance
+ .P
+@@ -15099,8 +15099,8 @@ reference software
+ 1: Strictly conform to all the things in the spec no matter what
+ consequences
+ 0: Default
+--1: Allow inofficial 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)"
+@@ -15127,7 +15127,7 @@ Use only bitexact stuff (except (i)dct)
+ .P
+ GOP size (0 = intra only)
+ .P
+-.BR ff_scenechange_threshold "=<number> (-1000000000..1000000000, default: 0)"
++.BR ff_scenechange_threshold "=<number> (\-1000000000..1000000000, default: 0)"
+ .P
+ Scenechange threshold
+ .P
+@@ -15245,7 +15245,7 @@ Amount of qscale smoothing over time
+ Quantizer noise shaping
+ .P
+ Choose quantization such that noise will be masked by
+-similar-frequency content in the image
++similar\-frequency content in the image
+
+ .P
+ .BR ff_trellis "=[1|0] (default: 0)"
+@@ -15255,22 +15255,22 @@ Use trellis quantization
+ Use trellis quantization (improves quality)
+
+ .P
+-.BR ff_i_quant_factor "=<number> (-31.0..31.0, default: -0.8)"
++.BR ff_i_quant_factor "=<number> (\-31.0..31.0, default: \-0.8)"
+ .P
+ I quantizer factor
+ .P
+-Quantizer factor between P-frames and I-frames.
++Quantizer factor between P\-frames and I\-frames.
+ 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)"
+ .P
+ I quantizer offset
+ .P
+-Quantizer offset between P-frames and I-frames
++Quantizer offset between P\-frames and I\-frames
+
+ .P
+ .BR ff_me_method "=<string>"
+@@ -15329,7 +15329,7 @@ Default: Use compare function
+ .P
+ MB decision mode
+ .P
+-.BR ff_dia_size "=<number> (-9..9, default: 0)"
++.BR ff_dia_size "=<number> (\-9..9, default: 0)"
+ .P
+ ME diamond size & shape
+ .P
+@@ -15338,11 +15338,11 @@ Motion estimation diamond size. Negative
+ .P
+ .BR ff_pre_me "=<number> (0..2, default: 0)"
+ .P
+-ME pre-pass
++ME pre\-pass
+ .P
+-Motion estimation pre-pass
++Motion estimation pre\-pass
+ 0: disabled
+-1: only after I-frames
++1: only after I\-frames
+ 2: always
+
+ .P
+@@ -15352,9 +15352,9 @@ Supported strings: SAD SSE SATD DCT PSNR
+ .P
+ Default: SAD
+ .P
+-ME pre-pass compare function
++ME pre\-pass compare function
+ .P
+-Motion estimation pre-pass compare function.
++Motion estimation pre\-pass compare function.
+ 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
+ .P
+ .BR ff_me_pre_cmp_chroma "=[1|0] (default: 0)"
+ .P
+-Enable chroma ME pre-pass compare
++Enable chroma ME pre\-pass compare
+ .P
+-.BR ff_pre_dia_size "=<number> (-9..9, default: 0)"
++.BR ff_pre_dia_size "=<number> (\-9..9, default: 0)"
+ .P
+-ME pre-pass diamond size & shape
++ME pre\-pass diamond size & shape
+ .P
+-Motion estimation pre-pass diamond size. Negative means shape
++Motion estimation pre\-pass diamond size. Negative means shape
+ adaptive.
+
+ .P
+@@ -15385,7 +15385,7 @@ adaptive.
+ Luminance masking
+ .P
+ Encode very bright image parts with reduced quality. 0 means
+-disabled, 0-0.3 is a sane range.
++disabled, 0\-0.3 is a sane range.
+
+ .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.
+ Darkness masking
+ .P
+ Encode very dark image parts with reduced quality. 0 means disabled,
+-0-0.3 is a sane range.
++0\-0.3 is a sane range.
+
+ .P
+ .BR ff_temporal_cplx_masking "=<number> (0.00..1.00, default: 0.00)"
+@@ -15409,7 +15409,7 @@ disabled.
+ Spatial complexity masking
+ .P
+ Encode very complex image parts with reduced quality. 0 means
+-disabled, 0-0.5 is a sane range.
++disabled, 0\-0.5 is a sane range.
+
+ .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
+ maintain the desired average
+
+ .P
+-.BR ff_strict_std_compliance "=<number> (-2..2, default: 0)"
++.BR ff_strict_std_compliance "=<number> (\-2..2, default: 0)"
+ .P
+ Standards compliance
+ .P
+@@ -15446,8 +15446,8 @@ reference software
+ 1: Strictly conform to all the things in the spec no matter what
+ consequences
+ 0: Default
+--1: Allow inofficial 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)"
+@@ -15631,7 +15631,7 @@ Use voice activity detection
+ .P
+ .BR dtx "=[1|0] (default: 0)"
+ .P
+-Enable file-based discontinuous transmission
++Enable file\-based discontinuous transmission
+ .P
+ .RE
+ .BR cbr "=[1|0] (default: 0)"
+@@ -15720,7 +15720,7 @@ frame duration here
+ .RE
+ .RE
+
+-.B -o
++.B \-o
+ .I <output_options>
+
+ .RS 2
+@@ -15731,7 +15731,7 @@ Set output options
+ .P
+ Output directory
+ .P
+-.BR output_filename_mask "=<string> (Default: %Y-%m-%d-%H-%M-%S)"
++.BR output_filename_mask "=<string> (Default: %Y\-%m\-%d\-%H\-%M\-%S)"
+ .P
+ Output filename mask
+ .P
+@@ -15756,13 +15756,13 @@ Extension is appended by the plugin
+ .P
+ .RE
+
+-.B -r
++.B \-r
+
+ .RS 2
+ Record to file
+ .RE
+
+-.B -syslog
++.B \-syslog
+ .I <name>
+
+ .RS 2
+@@ -15772,25 +15772,25 @@ Set log messages to syslog
+ .SH GENERIC OPTIONS
+ The following generic options are available for all gmerlin applications
+
+-.B -help
++.B \-help
+
+ .RS 2
+ Print this help message and exit
+ .RE
+
+-.B -help-man
++.B \-help\-man
+
+ .RS 2
+ Print this help message as a manual page and exit
+ .RE
+
+-.B -help-texi
++.B \-help\-texi
+
+ .RS 2
+ Print this help message in texinfo format and exit
+ .RE
+
+-.B -version
++.B \-version
+
+ .RS 2
+ Print version info and exit
--
gmerlin packaging
More information about the pkg-multimedia-commits
mailing list