[SCM] x264/master: Regenerate manpage

ricotz-guest at users.alioth.debian.org ricotz-guest at users.alioth.debian.org
Wed Jan 25 09:42:53 UTC 2017


The following commit has been merged in the master branch:
commit 5e8e6c147ebe4faf8da5fadccbae2e4d9a4c6c34
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Jan 25 10:40:18 2017 +0100

    Regenerate manpage

diff --git a/debian/x264.1 b/debian/x264.1
index a3de79c..374da17 100644
--- a/debian/x264.1
+++ b/debian/x264.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH X264 "1" "July 2013" "Videolan project" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH X264 "1" "January 2017" "Videolan project" "User Commands"
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:133 r2339 585324f
+x264 core:148 r2748 97eaef2
 Syntax: x264 [options] \fB\-o\fR outfile infile
 .PP
 Infile can be raw (in which case resolution is required),
@@ -16,11 +16,10 @@ or libav* formats if compiled with lavf support (yes) or ffms support (yes).
 \&.264 \-> Raw bytestream
 \&.mkv \-> Matroska
 \&.flv \-> Flash Video
-\&.mp4 \-> MP4 if compiled with GPAC support (yes)
+\&.mp4 \-> MP4 if compiled with GPAC or L\-SMASH support (gpac)
 .PP
 Output bit depth: 10 (configured at compile time)
 .SH OPTIONS
-
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 List basic options
@@ -60,34 +59,29 @@ Presets:
 Force the limits of an H.264 profile
 Overrides all settings.
 \- baseline:
-.IP
+.TP
 \fB\-\-no\-8x8dct\fR \fB\-\-bframes\fR 0 \fB\-\-no\-cabac\fR
 \fB\-\-cqm\fR flat \fB\-\-weightp\fR 0
 No interlaced.
 No lossless.
-.IP
+.TP
 \- main:
-.IP
 \fB\-\-no\-8x8dct\fR \fB\-\-cqm\fR flat
 No lossless.
-.IP
+.TP
 \- high:
-.IP
 No lossless.
-.IP
+.TP
 \- high10:
-.IP
 No lossless.
 Support for bit depth 8\-10.
-.IP
+.TP
 \- high422:
-.IP
 No lossless.
 Support for bit depth 8\-10.
 Support for 4:2:0/4:2:2 chroma subsampling.
-.IP
+.TP
 \- high444:
-.IP
 Support for bit depth 8\-10.
 Support for 4:2:0/4:2:2/4:4:4 chroma subsampling.
 .TP
@@ -95,59 +89,50 @@ Support for 4:2:0/4:2:2/4:4:4 chroma subsampling.
 Use a preset to select encoding settings [medium]
 Overridden by user settings.
 \- ultrafast:
-.IP
+.TP
 \fB\-\-no\-8x8dct\fR \fB\-\-aq\-mode\fR 0 \fB\-\-b\-adapt\fR 0
 \fB\-\-bframes\fR 0 \fB\-\-no\-cabac\fR \fB\-\-no\-deblock\fR
 \fB\-\-no\-mbtree\fR \fB\-\-me\fR dia \fB\-\-no\-mixed\-refs\fR
 \fB\-\-partitions\fR none \fB\-\-rc\-lookahead\fR 0 \fB\-\-ref\fR 1
 \fB\-\-scenecut\fR 0 \fB\-\-subme\fR 0 \fB\-\-trellis\fR 0
 \fB\-\-no\-weightb\fR \fB\-\-weightp\fR 0
-.IP
+.TP
 \- superfast:
-.IP
 \fB\-\-no\-mbtree\fR \fB\-\-me\fR dia \fB\-\-no\-mixed\-refs\fR
 \fB\-\-partitions\fR i8x8,i4x4 \fB\-\-rc\-lookahead\fR 0
 \fB\-\-ref\fR 1 \fB\-\-subme\fR 1 \fB\-\-trellis\fR 0 \fB\-\-weightp\fR 1
-.IP
+.TP
 \- veryfast:
-.IP
 \fB\-\-no\-mixed\-refs\fR \fB\-\-rc\-lookahead\fR 10
 \fB\-\-ref\fR 1 \fB\-\-subme\fR 2 \fB\-\-trellis\fR 0 \fB\-\-weightp\fR 1
-.IP
+.TP
 \- faster:
-.IP
 \fB\-\-no\-mixed\-refs\fR \fB\-\-rc\-lookahead\fR 20
 \fB\-\-ref\fR 2 \fB\-\-subme\fR 4 \fB\-\-weightp\fR 1
-.IP
+.TP
 \- fast:
-.IP
 \fB\-\-rc\-lookahead\fR 30 \fB\-\-ref\fR 2 \fB\-\-subme\fR 6
 \fB\-\-weightp\fR 1
-.IP
+.TP
 \- medium:
-.IP
 Default settings apply.
-.IP
+.TP
 \- slow:
-.IP
-\fB\-\-b\-adapt\fR 2 \fB\-\-direct\fR auto \fB\-\-me\fR umh
-\fB\-\-rc\-lookahead\fR 50 \fB\-\-ref\fR 5 \fB\-\-subme\fR 8
-.IP
+\fB\-\-direct\fR auto \fB\-\-rc\-lookahead\fR 50 \fB\-\-ref\fR 5
+\fB\-\-subme\fR 8 \fB\-\-trellis\fR 2
+.TP
 \- slower:
-.IP
 \fB\-\-b\-adapt\fR 2 \fB\-\-direct\fR auto \fB\-\-me\fR umh
 \fB\-\-partitions\fR all \fB\-\-rc\-lookahead\fR 60
 \fB\-\-ref\fR 8 \fB\-\-subme\fR 9 \fB\-\-trellis\fR 2
-.IP
+.TP
 \- veryslow:
-.IP
 \fB\-\-b\-adapt\fR 2 \fB\-\-bframes\fR 8 \fB\-\-direct\fR auto
 \fB\-\-me\fR umh \fB\-\-merange\fR 24 \fB\-\-partitions\fR all
 \fB\-\-ref\fR 16 \fB\-\-subme\fR 10 \fB\-\-trellis\fR 2
 \fB\-\-rc\-lookahead\fR 60
-.IP
+.TP
 \- placebo:
-.IP
 \fB\-\-bframes\fR 16 \fB\-\-b\-adapt\fR 2 \fB\-\-direct\fR auto
 \fB\-\-slow\-firstpass\fR \fB\-\-no\-fast\-pskip\fR
 \fB\-\-me\fR tesa \fB\-\-merange\fR 24 \fB\-\-partitions\fR all
@@ -157,48 +142,41 @@ Default settings apply.
 \fB\-\-tune\fR <string>
 Tune the settings for a particular type of source
 or situation
-.IP
+.TP
 Overridden by user settings.
 Multiple tunings are separated by commas.
 Only one psy tuning can be used at a time.
 \- film (psy tuning):
-.IP
+.TP
 \fB\-\-deblock\fR \fB\-1\fR:\-1 \fB\-\-psy\-rd\fR <unset>:0.15
-.IP
 \- animation (psy tuning):
-.IP
+.TP
 \fB\-\-bframes\fR {+2} \fB\-\-deblock\fR 1:1
 \fB\-\-psy\-rd\fR 0.4:<unset> \fB\-\-aq\-strength\fR 0.6
 \fB\-\-ref\fR {Double if >1 else 1}
-.IP
+.TP
 \- grain (psy tuning):
-.IP
 \fB\-\-aq\-strength\fR 0.5 \fB\-\-no\-dct\-decimate\fR
 \fB\-\-deadzone\-inter\fR 6 \fB\-\-deadzone\-intra\fR 6
 \fB\-\-deblock\fR \fB\-2\fR:\-2 \fB\-\-ipratio\fR 1.1
 \fB\-\-pbratio\fR 1.1 \fB\-\-psy\-rd\fR <unset>:0.25
 \fB\-\-qcomp\fR 0.8
-.IP
+.TP
 \- stillimage (psy tuning):
-.IP
 \fB\-\-aq\-strength\fR 1.2 \fB\-\-deblock\fR \fB\-3\fR:\-3
 \fB\-\-psy\-rd\fR 2.0:0.7
-.IP
+.TP
 \- psnr (psy tuning):
-.IP
 \fB\-\-aq\-mode\fR 0 \fB\-\-no\-psy\fR
-.IP
+.TP
 \- ssim (psy tuning):
-.IP
 \fB\-\-aq\-mode\fR 2 \fB\-\-no\-psy\fR
-.IP
+.TP
 \- fastdecode:
-.IP
 \fB\-\-no\-cabac\fR \fB\-\-no\-deblock\fR \fB\-\-no\-weightb\fR
 \fB\-\-weightp\fR 0
-.IP
+.TP
 \- zerolatency:
-.IP
 \fB\-\-bframes\fR 0 \fB\-\-force\-cfr\fR \fB\-\-no\-mbtree\fR
 \fB\-\-sync\-lookahead\fR 0 \fB\-\-sliced\-threads\fR
 \fB\-\-rc\-lookahead\fR 0
@@ -299,6 +277,8 @@ streams. Ignored in interlaced mode.
 \- 3: side by side \- L is on the left, R on the right
 \- 4: top bottom \- L is on top, R on bottom
 \- 5: frame alternation \- one view per frame
+\- 6: mono \- 2D frame without any frame packing
+\- 7: tile format \- L is on top\-left, R split across
 .PP
 Ratecontrol:
 .TP
@@ -349,7 +329,8 @@ QP difference between chroma and luma [0]
 AQ method [1]
 \- 0: Disabled
 \- 1: Variance AQ (complexity mask)
-\- 2: Auto\-variance AQ (experimental)
+\- 2: Auto\-variance AQ
+\- 3: Auto\-variance AQ with bias to dark scenes
 .TP
 \fB\-\-aq\-strength\fR <float>
 Reduces blocking and blurring in flat and
@@ -379,22 +360,19 @@ Reduce fluctuations in QP (after curve compression) [0.5]
 \fB\-\-zones\fR <zone0>/<zone1>/...
 Tweak the bitrate of regions of the video
 Each zone is of the form
-.IP
+.TP
 <start frame>,<end frame>,<option>
 where <option> is either
-.IP
-q=<integer> (force QP)
 .TP
-or
-b=<float> (bitrate multiplier)
+q=<integer> (force QP)
+or  b=<float> (bitrate multiplier)
 .TP
 \fB\-\-qpfile\fR <string>
 Force frametypes and QPs for some or all frames
 Format of each line: framenumber frametype QP
 QP is optional (none lets x264 choose). Frametypes: I,i,K,P,B,b.
-.IP
+.TP
 K=<I or i> depending on open\-gop setting
-.IP
 QPs are restricted by qpmin/qpmax.
 .PP
 Analysis:
@@ -528,21 +506,25 @@ Specify color range ["auto"]
 .TP
 \fB\-\-colorprim\fR <string>
 Specify color primaries ["undef"]
-\- undef, bt709, bt470m, bt470bg
-.IP
-smpte170m, smpte240m, film
+\- undef, bt709, bt470m, bt470bg, smpte170m,
+.TP
+smpte240m, film, bt2020, smpte428,
+smpte431, smpte432
 .TP
 \fB\-\-transfer\fR <string>
 Specify transfer characteristics ["undef"]
-\- undef, bt709, bt470m, bt470bg, linear,
-.IP
-log100, log316, smpte170m, smpte240m
+\- undef, bt709, bt470m, bt470bg, smpte170m,
+.TP
+smpte240m, linear, log100, log316,
+iec61966\-2\-4, bt1361e, iec61966\-2\-1,
+bt2020\-10, bt2020\-12, smpte2084, smpte428
 .TP
 \fB\-\-colormatrix\fR <string>
 Specify color matrix setting ["???"]
-\- undef, bt709, fcc, bt470bg
-.IP
-smpte170m, smpte240m, GBR, YCgCo
+\- undef, bt709, fcc, bt470bg, smpte170m,
+.TP
+smpte240m, GBR, YCgCo, bt2020nc, bt2020c,
+smpte2085
 .TP
 \fB\-\-chromaloc\fR <integer>
 Specify chroma sample location (0 to 5) [0]
@@ -551,6 +533,10 @@ Specify chroma sample location (0 to 5) [0]
 Signal HRD information (requires vbv\-bufsize)
 \- none, vbr, cbr (cbr not allowed in .mp4)
 .TP
+\fB\-\-filler\fR
+Force hard\-CBR and generate filler (implied by
+\fB\-\-nal\-hrd\fR cbr)
+.TP
 \fB\-\-pic\-struct\fR
 Force pic_struct in Picture Timing SEI
 .TP
@@ -577,11 +563,10 @@ Specify input file format (requires lavf support)
 \fB\-\-input\-csp\fR <string>
 Specify input colorspace format for raw input
 \- valid csps for `raw' demuxer:
-.IP
-i420, yv12, nv12, i422, yv16, nv16, i444, yv24, bgr, bgra, rgb
-.IP
+.TP
+i420, yv12, nv12, nv21, i422, yv16, nv16, i444, yv24, bgr, bgra, rgb
 \- valid csps for `lavf' demuxer:
-.IP
+.TP
 yuv420p, yuyv422, rgb24, bgr24, yuv422p,
 yuv444p, yuv410p, yuv411p, gray, monow, monob,
 pal8, yuvj420p, yuvj422p, yuvj444p, xvmcmc,
@@ -597,13 +582,36 @@ vaapi_idct, vaapi_vld, yuv420p16le,
 yuv420p16be, yuv422p16le, yuv422p16be,
 yuv444p16le, yuv444p16be, vdpau_mpeg4,
 dxva2_vld, rgb444le, rgb444be, bgr444le,
-bgr444be, y400a, bgr48be, bgr48le, yuv420p9be,
+bgr444be, ya8, bgr48be, bgr48le, yuv420p9be,
 yuv420p9le, yuv420p10be, yuv420p10le,
 yuv422p10be, yuv422p10le, yuv444p9be,
 yuv444p9le, yuv444p10be, yuv444p10le,
 yuv422p9be, yuv422p9le, vda_vld, gbrp, gbrp9be,
 gbrp9le, gbrp10be, gbrp10le, gbrp16be,
-gbrp16le
+gbrp16le, yuva422p, yuva444p, yuva420p9be,
+yuva420p9le, yuva422p9be, yuva422p9le,
+yuva444p9be, yuva444p9le, yuva420p10be,
+yuva420p10le, yuva422p10be, yuva422p10le,
+yuva444p10be, yuva444p10le, yuva420p16be,
+yuva420p16le, yuva422p16be, yuva422p16le,
+yuva444p16be, yuva444p16le, vdpau, xyz12le,
+xyz12be, nv16, nv20le, nv20be, rgba64be,
+rgba64le, bgra64be, bgra64le, yvyu422, vda,
+ya16be, ya16le, gbrap, gbrap16be, gbrap16le,
+qsv, mmal, d3d11va_vld, cuda, 0rgb, rgb0, 0bgr,
+bgr0, yuv420p12be, yuv420p12le, yuv420p14be,
+yuv420p14le, yuv422p12be, yuv422p12le,
+yuv422p14be, yuv422p14le, yuv444p12be,
+yuv444p12le, yuv444p14be, yuv444p14le,
+gbrp12be, gbrp12le, gbrp14be, gbrp14le,
+yuvj411p, bayer_bggr8, bayer_rggb8,
+bayer_gbrg8, bayer_grbg8, bayer_bggr16le,
+bayer_bggr16be, bayer_rggb16le, bayer_rggb16be,
+bayer_gbrg16le, bayer_gbrg16be, bayer_grbg16le,
+bayer_grbg16be, yuv440p10le, yuv440p10be,
+yuv440p12le, yuv440p12be, ayuv64le, ayuv64be,
+videotoolbox_vld, p010le, p010be, gbrap12be,
+gbrap12le, gbrap10be, gbrap10le, mediacodec
 .TP
 \fB\-\-output\-csp\fR <string>
 Specify output colorspace ["i420"]
@@ -639,6 +647,13 @@ Specify level (as defined by Annex A)
 \fB\-\-bluray\-compat\fR
 Enable compatibility hacks for Blu\-ray support
 .TP
+\fB\-\-avcintra\-class\fR <integer> Use compatibility hacks for AVC\-Intra class
+\- 50, 100, 200
+.TP
+\fB\-\-stitchable\fR
+Don't optimize headers based on video content
+Ensures ability to recombine a segmented encode
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 Print stats for each frame
 .TP
@@ -688,12 +703,8 @@ Disable all CPU optimizations
 Enable use of OpenCL
 .HP
 \fB\-\-opencl\-clbin\fR <string> Specify path of compiled OpenCL kernel cache
-.TP
-\fB\-\-opencl\-device\fR <integer>
-Specify OpenCL device ordinal
-.TP
-\fB\-\-visualize\fR
-Show MB types overlayed on the encoded video
+.HP
+\fB\-\-opencl\-device\fR <integer> Specify OpenCL device ordinal
 .TP
 \fB\-\-dump\-yuv\fR <string>
 Save reconstructed frames
@@ -747,7 +758,7 @@ resizes frames based on the given criteria:
 \- fittobox and sar: same as above except with specified sar
 \- csp: convert to the given csp. syntax: [name][:depth]
 .IP
-\- valid csp names [keep current]: i420, yv12, nv12, i422, yv16, nv16, i444, yv24, bgr, bgra, rgb
+\- valid csp names [keep current]: i420, yv12, nv12, nv21, i422, yv16, nv16, i444, yv24, bgr, bgra, rgb
 \- depth: 8 or 16 bits per pixel [keep current]
 .IP
 note: not all depths are supported by all csps.
@@ -761,12 +772,13 @@ select_every:step,offset1[,...]
 apply a selection pattern to input frames
 step: the number of frames in the pattern
 offsets: the offset into the step to select a frame
-see: http://avisynth.org/mediawiki/Select#SelectEvery
+see: http://avisynth.nl/index.php/Select#SelectEvery
 .PP
-(libswscale 2.1.2)
-(libavformat 55.1.0)
-(ffmpegsource 2.17.4.0)
-built on Jul 26 2013, gcc: 4.8.1
-configuration: \fB\-\-bit\-depth\fR=\fI10\fR \fB\-\-chroma\-format\fR=\fIall\fR
+(libswscale 4.2.100)
+(libavformat 57.56.100)
+(ffmpegsource 2.23.0.0)
+built on Jan 25 2017, gcc: 6.3.0 20170121
+x264 configuration: \fB\-\-bit\-depth\fR=\fI\,8\/\fR \fB\-\-chroma\-format\fR=\fI\,all\/\fR
+libx264 configuration: \fB\-\-bit\-depth\fR=\fI\,10\/\fR \fB\-\-chroma\-format\fR=\fI\,all\/\fR
 x264 license: GPL version 2 or later
 libswscale/libavformat/ffmpegsource license: GPL version 2 or later

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list