[SCM] x264/master: Regenerate debian/control and manpage

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

The following commit has been merged in the master branch:
commit f4982f76d87f85735539c41abbee43ae879b508e
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Fri Jul 26 18:42:48 2013 +0200

    Regenerate debian/control and manpage

diff --git a/debian/control b/debian/control
index 02f416b..5fb809e 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Description: video encoder for the H.264/MPEG-4 AVC standard
   * parallel encoding on multiple CPUs
   * interlaced streams
 
-Package: libx264-130
+Package: libx264-133
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -66,7 +66,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libx264-130 (= ${binary:Version}),
+ libx264-133 (= ${binary:Version}),
  ${misc:Depends}
 Description: development files for libx264
  libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)
diff --git a/debian/x264.1 b/debian/x264.1
index 6ff65c6..a3de79c 100644
--- a/debian/x264.1
+++ b/debian/x264.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.41.2.
-.TH X264 "1" "May 2013" "Videolan project" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
+.TH X264 "1" "July 2013" "Videolan project" "User Commands"
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:130 r2282 1db4621
+x264 core:133 r2339 585324f
 Syntax: x264 [options] \fB\-o\fR outfile infile
 .PP
 Infile can be raw (in which case resolution is required),
@@ -263,10 +263,16 @@ Loop filter parameters [0:0]
 \fB\-\-slices\fR <integer>
 Number of slices per frame; forces rectangular
 slices and is overridden by other slicing options
+.TP
+\fB\-\-slices\-max\fR <integer>
+Absolute maximum slices per frame; overrides
+slice\-max\-size/slice\-max\-mbs when necessary
 .HP
 \fB\-\-slice\-max\-size\fR <integer> Limit the size of each slice in bytes
 .HP
-\fB\-\-slice\-max\-mbs\fR <integer> Limit the size of each slice in macroblocks
+\fB\-\-slice\-max\-mbs\fR <integer> Limit the size of each slice in macroblocks (max)
+.HP
+\fB\-\-slice\-min\-mbs\fR <integer> Limit the size of each slice in macroblocks (min)
 .TP
 \fB\-\-tff\fR
 Enable interlaced mode (top field first)
@@ -678,6 +684,14 @@ Override CPU detection
 \fB\-\-no\-asm\fR
 Disable all CPU optimizations
 .TP
+\fB\-\-opencl\fR
+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
 .TP
@@ -749,10 +763,10 @@ 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.1.1)
-(libavformat 54.21.3)
-(ffmpegsource 2.17.3.0)
-built on May 11 2013, gcc: 4.8.0
+(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
 x264 license: GPL version 2 or later
 libswscale/libavformat/ffmpegsource license: GPL version 2 or later

-- 
x264 packaging