[SCM] x264/master: Regenerate manpage

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

The following commit has been merged in the master branch:
commit 082912ff2ad3559fc5d005cba7502e3e1050feea
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sun Feb 5 10:28:16 2012 +0100

    Regenerate manpage

diff --git a/debian/x264.1 b/debian/x264.1
index c42d73f..6336281 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.5.
-.TH X264 "1" "January 2012" "Videolan project" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
+.TH X264 "1" "February 2012" "Videolan project" "User Commands"
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:120 r2127 f33c8cb
+x264 core:120 r2151 a3f4407
 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 (no).
+or libav* formats if compiled with lavf support (yes) or ffms support (yes).
 .SS "Outfile type is selected by filename:"
 .IP
 \&.264 \-> Raw bytestream
@@ -563,7 +563,7 @@ Specify output container format ["auto"]
 .TP
 \fB\-\-demuxer\fR <string>
 Specify input container format ["auto"]
-\- auto, raw, y4m, lavf
+\- auto, raw, y4m, lavf, ffms
 .TP
 \fB\-\-input\-fmt\fR <string>
 Specify input file format (requires lavf support)
@@ -749,7 +749,8 @@ see: http://avisynth.org/mediawiki/Select#SelectEvery
 .PP
 (libswscale 2.1.0)
 (libavformat 53.20.0)
-built on Jan 23 2012, gcc: 4.6.2
+(ffmpegsource 2.17.0.0)
+built on Feb  5 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 license: GPL version 2 or later
+libswscale/libavformat/ffmpegsource license: GPL version 2 or later

-- 
x264 packaging