[SCM] x264/master: Regenerate manpage

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

The following commit has been merged in the master branch:
commit cf703771203f66f8465c2067d43776becebcdcac
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sun Apr 29 19:55:36 2012 +0200

    Regenerate manpage

diff --git a/debian/x264.1 b/debian/x264.1
index 2b1b75c..15ae6a8 100644
--- a/debian/x264.1
+++ b/debian/x264.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH X264 "1" "March 2012" "Videolan project" "User Commands"
+.TH X264 "1" "April 2012" "Videolan project" "User Commands"
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:120 r2171 01f7a33
+x264 core:123 r2189 35cf912
 Syntax: x264 [options] \fB\-o\fR outfile infile
 .PP
 Infile can be raw (in which case resolution is required),
@@ -16,7 +16,7 @@ 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 (no)
+\&.mp4 \-> MP4 if compiled with GPAC support (yes)
 .PP
 Output bit depth: 8 (configured at compile time)
 .SH OPTIONS
@@ -559,7 +559,7 @@ Specify output file
 .TP
 \fB\-\-muxer\fR <string>
 Specify output container format ["auto"]
-\- auto, raw, mkv, flv
+\- auto, raw, mkv, flv, mp4
 .TP
 \fB\-\-demuxer\fR <string>
 Specify input container format ["auto"]
@@ -748,9 +748,9 @@ offsets: the offset into the step to select a frame
 see: http://avisynth.org/mediawiki/Select#SelectEvery
 .PP
 (libswscale 2.1.0)
-(libavformat 53.20.0)
+(libavformat 53.21.0)
 (ffmpegsource 2.17.0.0)
-built on Mar 15 2012, gcc: 4.6.3
+built on Apr 29 2012, gcc: 4.7.0
 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

-- 
x264 packaging