[SCM] x264/master: Regenerate manpage for x264 version 120.2127.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a3104743d0a07c99fb037bf8f60404718673d9bf
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Jan 23 15:48:57 2012 +0100

    Regenerate manpage for x264 version 120.2127.

diff --git a/debian/x264.1 b/debian/x264.1
index a7c9b46..c42d73f 100644
--- a/debian/x264.1
+++ b/debian/x264.1
@@ -1,16 +1,16 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.5.
 .TH X264 "1" "January 2012" "Videolan project" "User Commands"
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:118 r2092 6eac7c3
+x264 core:120 r2127 f33c8cb
 Syntax: x264 [options] \fB\-o\fR outfile infile
 .PP
 Infile can be raw (in which case resolution is required),
 .IP
 or YUV4MPEG (*.y4m),
 or Avisynth if compiled with support (no).
-or libav* formats if compiled with lavf support (yes) or ffms support (yes).
+or libav* formats if compiled with lavf support (yes) or ffms support (no).
 .SS "Outfile type is selected by filename:"
 .IP
 \&.264 \-> Raw bytestream
@@ -516,9 +516,9 @@ Specify crop overscan setting ["undef"]
 Specify video format ["undef"]
 \- component, pal, ntsc, secam, mac, undef
 .TP
-\fB\-\-fullrange\fR <string>
-Specify full range samples setting ["???"]
-\- off, on
+\fB\-\-range\fR <string>
+Specify color range ["auto"]
+\- auto, tv, pc
 .TP
 \fB\-\-colorprim\fR <string>
 Specify color primaries ["undef"]
@@ -563,7 +563,7 @@ Specify output container format ["auto"]
 .TP
 \fB\-\-demuxer\fR <string>
 Specify input container format ["auto"]
-\- auto, raw, y4m, lavf, ffms
+\- auto, raw, y4m, lavf
 .TP
 \fB\-\-input\-fmt\fR <string>
 Specify input file format (requires lavf support)
@@ -594,7 +594,10 @@ dxva2_vld, rgb444le, rgb444be, bgr444le,
 bgr444be, y400a, bgr48be, bgr48le, yuv420p9be,
 yuv420p9le, yuv420p10be, yuv420p10le,
 yuv422p10be, yuv422p10le, yuv444p9be,
-yuv444p9le, yuv444p10be, yuv444p10le
+yuv444p9le, yuv444p10be, yuv444p10le,
+yuv422p9be, yuv422p9le, vda_vld, gbrp, gbrp9be,
+gbrp9le, gbrp10be, gbrp10le, gbrp16be,
+gbrp16le
 .TP
 \fB\-\-output\-csp\fR <string>
 Specify output colorspace ["i420"]
@@ -602,6 +605,10 @@ Specify output colorspace ["i420"]
 .HP
 \fB\-\-input\-depth\fR <integer> Specify input bit depth for raw input
 .TP
+\fB\-\-input\-range\fR <string>
+Specify input color range ["auto"]
+\- auto, tv, pc
+.TP
 \fB\-\-input\-res\fR <intxint>
 Specify input resolution (width x height)
 .TP
@@ -740,10 +747,9 @@ 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
 .PP
-(libswscale 2.0.0)
-(libavformat 53.3.0)
-(ffmpegsource 2.16.0.0)
-built on Jan  8 2012, gcc: 4.6.2
-configuration: \fB\-\-bit\-depth\fR=\fI8\fR
+(libswscale 2.1.0)
+(libavformat 53.20.0)
+built on Jan 23 2012, gcc: 4.6.2
+configuration: \fB\-\-bit\-depth\fR=\fI8\fR \fB\-\-chroma\-format\fR=\fIall\fR
 x264 license: GPL version 2 or later
-libswscale/libavformat/ffmpegsource license: GPL version 2 or later
+libswscale/libavformat license: GPL version 2 or later

-- 
x264 packaging