[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1448+git1a6d32-2-5-g63d0b31

Sun Mar 14 09:13:47 UTC 2010

The following commit has been merged in the ubuntu branch:
commit 2990ee06b7b7128d3b7b29a1a442947e43645e15
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 14 10:06:52 2010 +0100

    generate manpage with help2man to keep it up-to-date, LP: #391281

diff --git a/debian/control b/debian/control
index 2929cdf..b6a7f14 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: extra
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>
 Build-Depends: debhelper (>= 7),
+               help2man,
                yasm [i386 amd64 kfreebsd-amd64 lpia],
                libgpac-dev,
                libx11-dev
diff --git a/debian/rules b/debian/rules
index a03b3f4..b95fd4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,13 +41,17 @@ endif
 	mv version.sh-upstream version.sh
 	touch $@
 
+debian/x264.1: build-stamp
+	help2man -n"fast h264 encoder" -N -s1 -S "Videolan project" -h '--fullhelp' \
+		debian/install/static/usr/bin/x264 > $@
+
 clean:
 	dh_testdir
 	dh_testroot
 	rm -rf debian/install
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f version.sh-upstream ] ||  mv version.sh-upstream version.sh
-	dh_clean build-stamp
+	dh_clean build-stamp debian/x264.1
 
 install:
 	dh_testdir
@@ -60,7 +64,7 @@ ifeq ($(do_opt),yes)
 	cp -a debian/install/opt$(opt_libdir)/*.so.* debian/$(libx264N)$(opt_libdir)
 endif
 
-binary-arch: build install
+binary-arch: build install debian/x264.1
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -s
diff --git a/debian/x264.1 b/debian/x264.1
deleted file mode 100644
index eca9c7e..0000000
--- a/debian/x264.1
+++ /dev/null
@@ -1,335 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH X264 "1" "March 2007" "x264" "User Commands"
-.SH NAME
-x264 \- H.264 encoder
-.SH SYNOPSIS
-\fBx264 [options] \-o outfile infile [widthxheight]
-.SH DESCRIPTION
-x264 encodes a video stream using the H.264 codec.
-.PP
-Infile can be raw YUV 4:2:0 (in which case resolution is required) or
-YUV4MPEG 4:2:0 (*.y4m).
-.PP
-Outfile type is selected by filename: \fB.264\fR (raw bytestream) or
-\fB.mkv\fR (Matroska).
-.SH OPTIONS
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-List the more commonly used options
-.TP
-\fB\-\-longhelp\fR
-List all options
-.PP
-Frame\-type options:
-.TP
-\fB\-I\fR, \fB\-\-keyint\fR <integer>
-Maximum GOP size [250]
-.TP
-\fB\-i\fR, \fB\-\-min\-keyint\fR <integer>
-Minimum GOP size [25]
-.TP
-\fB\-\-scenecut\fR <integer>
-How aggressively to insert extra I\-frames [40]
-.TP
-\fB\-\-pre\-scenecut\fR
-Faster, less precise scenecut detection.
-Required and implied by multi\-threading.
-.TP
-\fB\-b\fR, \fB\-\-bframes\fR <integer>
-Number of B\-frames between I and P [0]
-.TP
-\fB\-\-no\-b\-adapt\fR
-Disable adaptive B\-frame decision
-.TP
-\fB\-\-b\-bias\fR <integer>
-Influences how often B\-frames are used [0]
-.TP
-\fB\-\-b\-pyramid\fR
-Keep some B\-frames as references
-.TP
-\fB\-\-no\-cabac\fR
-Disable CABAC
-.TP
-\fB\-r\fR, \fB\-\-ref\fR <integer>
-Number of reference frames [1]
-.TP
-\fB\-\-no\-deblock\fR
-Disable loop filter
-.TP
-\fB\-f\fR, \fB\-\-deblock\fR <alpha:beta>
-Loop filter AlphaC0 and Beta parameters [0:0]
-.TP
-\fB\-\-interlaced\fR
-Enable pure\-interlaced mode
-.PP
-Ratecontrol:
-.TP
-\fB\-q\fR, \fB\-\-qp\fR <integer>
-Set QP (0=lossless) [26]
-.TP
-\fB\-B\fR, \fB\-\-bitrate\fR <integer>
-Set bitrate (kbit/s)
-.TP
-\fB\-\-crf\fR <float>
-Quality\-based VBR (nominal QP)
-.HP
-\fB\-\-vbv\-maxrate\fR <integer> Max local bitrate (kbit/s) [0]
-.HP
-\fB\-\-vbv\-bufsize\fR <integer> Enable CBR and set size of the VBV buffer (kbit) [0]
-.TP
-\fB\-\-vbv\-init\fR <float>
-Initial VBV buffer occupancy [0.9]
-.TP
-\fB\-\-qpmin\fR <integer>
-Set min QP [10]
-.TP
-\fB\-\-qpmax\fR <integer>
-Set max QP [51]
-.TP
-\fB\-\-qpstep\fR <integer>
-Set max QP step [4]
-.TP
-\fB\-\-ratetol\fR <float>
-Allowed variance of average bitrate [1.0]
-.TP
-\fB\-\-ipratio\fR <float>
-QP factor between I and P [1.40]
-.TP
-\fB\-\-pbratio\fR <float>
-QP factor between P and B [1.30]
-.TP
-\fB\-\-chroma\-qp\-offset\fR <integer>
-QP difference between chroma and luma [0]
-.TP
-\fB\-p\fR, \fB\-\-pass\fR <1|2|3>
-Enable multipass ratecontrol
-\- 1: First pass, creates stats file
-\- 2: Last pass, does not overwrite stats file
-\- 3: Nth pass, overwrites stats file
-.TP
-\fB\-\-stats\fR <string>
-Filename for 2 pass stats ["x264_2pass.log"]
-.TP
-\fB\-\-rceq\fR <string>
-Ratecontrol equation ["blurCplx^(1\-qComp)"]
-.TP
-\fB\-\-qcomp\fR <float>
-QP curve compression: 0.0 => CBR, 1.0 => CQP [0.60]
-.TP
-\fB\-\-cplxblur\fR <float>
-Reduce fluctuations in QP (before curve compression) [20.0]
-.TP
-\fB\-\-qblur\fR <float>
-Reduce fluctuations in QP (after curve compression) [0.5]
-.TP
-\fB\-\-zones\fR <zone0>/<zone1>/...
-Tweak the bitrate of some regions of the video
-Each zone is of the form
-.IP
-<start frame>,<end frame>,<option>
-where <option> is either
-.IP
-q=<integer> (force QP)
-.TP
-or
-b=<float> (bitrate multiplier)
-.TP
-\fB\-\-qpfile\fR <string>
-Force frametypes and QPs
-.PP
-Analysis:
-.TP
-\fB\-A\fR, \fB\-\-partitions\fR <string>
-Partitions to consider ["p8x8,b8x8,i8x8,i4x4"]
-\- p8x8, p4x4, b8x8, i8x8, i4x4
-\- none, all
-(p4x4 requires p8x8. i8x8 requires \fB\-\-8x8dct\fR.)
-.TP
-\fB\-\-direct\fR <string>
-Direct MV prediction mode ["spatial"]
-\- none, spatial, temporal, auto
-.TP
-\fB\-\-direct\-8x8\fR <\-1|0|1>
-Direct prediction size [\-1]
-\-  0: 4x4
-\-  1: 8x8
-\- \fB\-1\fR: smallest possible according to level
-.TP
-\fB\-w\fR, \fB\-\-weightb\fR
-Weighted prediction for B\-frames
-.TP
-\fB\-\-me\fR <string>
-Integer pixel motion estimation method ["hex"]
-\- dia: diamond search, radius 1 (fast)
-\- hex: hexagonal search, radius 2
-\- umh: uneven multi\-hexagon search
-\- esa: exhaustive search (slow)
-.TP
-\fB\-\-merange\fR <integer>
-Maximum motion vector search range [16]
-.TP
-\fB\-\-mvrange\fR <integer>
-Maximum motion vector length [\-1 (auto)]
-.TP
-\fB\-\-mvrange\-thread\fR <int>
-Minimum buffer between threads [\-1 (auto)]
-.TP
-\fB\-m\fR, \fB\-\-subme\fR <integer>
-Subpixel motion estimation and partition
-decision quality: 1=fast, 7=best. [5]
-.TP
-\fB\-\-b\-rdo\fR
-RD based mode decision for B\-frames. Requires subme 6.
-.TP
-\fB\-\-mixed\-refs\fR
-Decide references on a per partition basis
-.TP
-\fB\-\-no\-chroma\-me\fR
-Ignore chroma in motion estimation
-.TP
-\fB\-8\fR, \fB\-\-8x8dct\fR
-Adaptive spatial transform size
-.TP
-\fB\-t\fR, \fB\-\-trellis\fR <integer>
-Trellis RD quantization. Requires CABAC. [0]
-\- 0: disabled
-\- 1: enabled only on the final encode of a MB
-\- 2: enabled on all mode decisions
-.TP
-\fB\-\-no\-fast\-pskip\fR
-Disables early SKIP detection on P\-frames
-.TP
-\fB\-\-no\-dct\-decimate\fR
-Disables coefficient thresholding on P\-frames
-.TP
-\fB\-\-nr\fR <integer>
-Noise reduction [0]
-.TP
-\fB\-\-deadzone\-inter\fR <int>
-Set the size of the inter luma quantization deadzone [21]
-.TP
-\fB\-\-deadzone\-intra\fR <int>
-Set the size of the intra luma quantization deadzone [11]
-Deadzones should be in the range 0 \- 32.
-.TP
-\fB\-\-cqm\fR <string>
-Preset quant matrices ["flat"]
-\- jvt, flat
-.TP
-\fB\-\-cqmfile\fR <string>
-Read custom quant matrices from a JM\-compatible file
-Overrides any other \fB\-\-cqm\fR* options.
-.TP
-\fB\-\-cqm4\fR <list>
-Set all 4x4 quant matrices
-Takes a comma\-separated list of 16 integers.
-.TP
-\fB\-\-cqm8\fR <list>
-Set all 8x8 quant matrices
-Takes a comma\-separated list of 64 integers.
-.TP
-\fB\-\-cqm4i\fR, \fB\-\-cqm4p\fR, \fB\-\-cqm8i\fR, \fB\-\-cqm8p\fR
-Set both luma and chroma quant matrices
-.TP
-\fB\-\-cqm4iy\fR, \fB\-\-cqm4ic\fR, \fB\-\-cqm4py\fR, \fB\-\-cqm4pc\fR
-Set individual quant matrices
-.PP
-Video Usability Info (Annex E):
-The VUI settings are not used by the encoder but are merely suggestions to
-the playback equipment. See doc/vui.txt for details. Use at your own risk.
-.TP
-\fB\-\-overscan\fR <string>
-Specify crop overscan setting ["undef"]
-\- undef, show, crop
-.TP
-\fB\-\-videoformat\fR <string>
-Specify video format ["undef"]
-\- component, pal, ntsc, secam, mac, undef
-.TP
-\fB\-\-fullrange\fR <string>
-Specify full range samples setting ["off"]
-\- off, on
-.TP
-\fB\-\-colorprim\fR <string>
-Specify color primaries ["undef"]
-\- undef, bt709, bt470m, bt470bg
-.IP
-smpte170m, smpte240m, film
-.TP
-\fB\-\-transfer\fR <string>
-Specify transfer characteristics ["undef"]
-\- undef, bt709, bt470m, bt470bg, linear,
-.IP
-log100, log316, smpte170m, smpte240m
-.TP
-\fB\-\-colormatrix\fR <string>
-Specify color matrix setting ["undef"]
-\- undef, bt709, fcc, bt470bg
-.IP
-smpte170m, smpte240m, GBR, YCgCo
-.TP
-\fB\-\-chromaloc\fR <integer>
-Specify chroma sample location (0 to 5) [0]
-.PP
-Input/Output:
-.TP
-\fB\-o\fR, \fB\-\-output\fR
-Specify output file
-.TP
-\fB\-\-sar\fR width:height
-Specify Sample Aspect Ratio
-.TP
-\fB\-\-fps\fR <float|rational>
-Specify framerate
-.TP
-\fB\-\-seek\fR <integer>
-First frame to encode
-.TP
-\fB\-\-frames\fR <integer>
-Maximum number of frames to encode
-.TP
-\fB\-\-level\fR <string>
-Specify level (as defined by Annex A)
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Print stats for each frame
-.TP
-\fB\-\-progress\fR
-Show a progress indicator while encoding
-.TP
-\fB\-\-quiet\fR
-Quiet Mode
-.TP
-\fB\-\-no\-psnr\fR
-Disable PSNR computation
-.TP
-\fB\-\-no\-ssim\fR
-Disable SSIM computation
-.TP
-\fB\-\-threads\fR <integer>
-Parallel encoding
-.TP
-\fB\-\-thread\-input\fR
-Run Avisynth in its own thread
-.TP
-\fB\-\-non\-deterministic\fR
-Slightly improve quality of SMP, at the cost of repeatability
-.TP
-\fB\-\-no\-asm\fR
-Disable all CPU optimizations
-.TP
-\fB\-\-visualize\fR
-Show MB types overlayed on the encoded video
-.TP
-\fB\-\-sps\-id\fR <integer>
-Set SPS and PPS id numbers [0]
-.TP
-\fB\-\-aud\fR
-Use access unit delimiters
-.SH "SEE ALSO"
-.B ffmpeg(1)
-.SH AUTHORS
-x264 was written by Laurent Aimar <fenrir at via.ecp.fr> et al.
-.PP
-This manual page was written by Sam Hocevar <sam at zoy.org> for the Debian
-project (but may be used by others).

-- 
x264 packaging

