[SCM] x264/master: improve debian/changelog

Sun Jan 8 20:00:40 UTC 2012

The following commit has been merged in the master branch:
commit c33a5bf5e2f13fafa72c0a1bdec927d899897c01
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Sun Jan 8 21:00:34 2012 +0100

    improve debian/changelog

diff --git a/debian/changelog b/debian/changelog
index dc53f3b..c7b07f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
 x264 (2:0.118.2092+git6eac7c3-3) UNRELEASED; urgency=low
 
-  * One less hard-coded library SONAME in debian/rules.
-  * Remove redundant and faulty blabber from debian/rules.
-  * Simplify creation of debian/*.install files.
-  * Do not build the CLI for the optimized shared library.
-  * Disable the CLI for the static build as well and regenerate
-    manpage from the shared build instead.
-  * Remove library SONAME from debian/libx264N.install file.
-  * Simplify manpage regeneration.
-
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Sun, 08 Jan 2012 13:41:01 +0100
+  * Simplify the debhelper install file generation.
+  * Do not hard-code the library SONAME in debian/rules
+    and the debhelper install file anymore.
+  * Build the CLI only for the shared library build,
+    as this is the actual configuration that we ship in the x264 package.
+  * Generate the manpage from the CLI of the shared build.
+  * Simplify the manpage generation.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Sun, 08 Jan 2012 20:59:14 +0100
 
 x264 (2:0.118.2092+git6eac7c3-2) unstable; urgency=low
 
diff --git a/debian/x264.1 b/debian/x264.1
index 6d0a529..a7c9b46 100644
--- a/debian/x264.1
+++ b/debian/x264.1
@@ -1,22 +1,22 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH X264 "1" "July 2011" "Videolan project" "User Commands"
+.TH X264 "1" "January 2012" "Videolan project" "User Commands"
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:118 r2085 8a62835
+x264 core:118 r2092 6eac7c3
 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 (no) or ffms support (yes).
+or libav* formats if compiled with lavf support (yes) or ffms support (yes).
 .SS "Outfile type is selected by filename:"
 .IP
 \&.264 \-> Raw bytestream
 \&.mkv \-> Matroska
 \&.flv \-> Flash Video
-\&.mp4 \-> MP4 if compiled with GPAC support (yes)
+\&.mp4 \-> MP4 if compiled with GPAC support (no)
 .PP
 Output bit depth: 8 (configured at compile time)
 .SH OPTIONS
@@ -79,6 +79,17 @@ No lossless.
 .IP
 No lossless.
 Support for bit depth 8\-10.
+.IP
+\- high422:
+.IP
+No lossless.
+Support for bit depth 8\-10.
+Support for 4:2:0/4:2:2 chroma subsampling.
+.IP
+\- high444:
+.IP
+Support for bit depth 8\-10.
+Support for 4:2:0/4:2:2/4:4:4 chroma subsampling.
 .TP
 \fB\-\-preset\fR <string>
 Use a preset to select encoding settings [medium]
@@ -548,11 +559,11 @@ Specify output file
 .TP
 \fB\-\-muxer\fR <string>
 Specify output container format ["auto"]
-\- auto, raw, mkv, flv, mp4
+\- auto, raw, mkv, flv
 .TP
 \fB\-\-demuxer\fR <string>
 Specify input container format ["auto"]
-\- auto, raw, y4m, ffms
+\- auto, raw, y4m, lavf, ffms
 .TP
 \fB\-\-input\-fmt\fR <string>
 Specify input file format (requires lavf support)
@@ -561,11 +572,33 @@ Specify input file format (requires lavf support)
 Specify input colorspace format for raw input
 \- valid csps for `raw' demuxer:
 .IP
-i420, yv12, nv12, i444, yv24, bgr, bgra, rgb, i422
+i420, yv12, nv12, i422, yv16, nv16, i444, yv24, bgr, bgra, rgb
+.IP
+\- valid csps for `lavf' demuxer:
+.IP
+yuv420p, yuyv422, rgb24, bgr24, yuv422p,
+yuv444p, yuv410p, yuv411p, gray, monow, monob,
+pal8, yuvj420p, yuvj422p, yuvj444p, xvmcmc,
+xvmcidct, uyvy422, uyyvyy411, bgr8, bgr4,
+bgr4_byte, rgb8, rgb4, rgb4_byte, nv12, nv21,
+argb, rgba, abgr, bgra, gray16be, gray16le,
+yuv440p, yuvj440p, yuva420p, vdpau_h264,
+vdpau_mpeg1, vdpau_mpeg2, vdpau_wmv3,
+vdpau_vc1, rgb48be, rgb48le, rgb565be,
+rgb565le, rgb555be, rgb555le, bgr565be,
+bgr565le, bgr555be, bgr555le, vaapi_moco,
+vaapi_idct, vaapi_vld, yuv420p16le,
+yuv420p16be, yuv422p16le, yuv422p16be,
+yuv444p16le, yuv444p16be, vdpau_mpeg4,
+dxva2_vld, rgb444le, rgb444be, bgr444le,
+bgr444be, y400a, bgr48be, bgr48le, yuv420p9be,
+yuv420p9le, yuv420p10be, yuv420p10le,
+yuv422p10be, yuv422p10le, yuv444p9be,
+yuv444p9le, yuv444p10be, yuv444p10le
 .TP
 \fB\-\-output\-csp\fR <string>
 Specify output colorspace ["i420"]
-\- i420, i444, rgb
+\- i420, i422, i444, rgb
 .HP
 \fB\-\-input\-depth\fR <integer> Specify input bit depth for raw input
 .TP
@@ -626,6 +659,10 @@ Run Avisynth in its own thread
 \fB\-\-non\-deterministic\fR
 Slightly improve quality of SMP, at the cost of repeatability
 .TP
+\fB\-\-cpu\-independent\fR
+Ensure exact reproducibility across different cpus,
+as opposed to letting them select different algorithms
+.TP
 \fB\-\-asm\fR <integer>
 Override CPU detection
 .TP
@@ -687,7 +724,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, i444, yv24, bgr, bgra, rgb, i422
+\- valid csp names [keep current]: i420, yv12, nv12, 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.
@@ -704,8 +741,9 @@ offsets: the offset into the step to select a frame
 see: http://avisynth.org/mediawiki/Select#SelectEvery
 .PP
 (libswscale 2.0.0)
-(ffmpegsource 2.14.2.0)
-built on Jul 26 2011, gcc: 4.6.1
+(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
 x264 license: GPL version 2 or later
-libswscale/ffmpegsource license: GPL version 2 or later
+libswscale/libavformat/ffmpegsource license: GPL version 2 or later

-- 
x264 packaging

