Updated deployment scripts.

diff --git a/ReadMe.txt b/ReadMe.txt
index 97e9692..2b32fde 100644 (file)
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,53 +1,30 @@
-Simple x264 Launcher - use 64-Bit x264 with 32-Bit Avisynth
+Simple x264 Launcher - graphical front-end for x264 and x265
 Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
 
 
 1. Introduction
 ---------------
 
-This program is a simple GUI front-end for the x264 H.264/AVC encoder.
+This program is a simple GUI front-end for the x264 H.264/AVC encoder
+and (in newer versions) also supports the x265 H.265/HEVC encoder.
 
-For information about the x264 encoder software, please see:
-http://en.wikipedia.org/wiki/X264
+Avisynth/VapourSynth input as well as built-in decoders are supported.
 
-For information about Graphical User Interfaces (GUI), please see:
-http://en.wikipedia.org/wiki/Graphical_user_interface
 
-
-2. List of Features
--------------------
-
-(a) Support for 32-Bit and 64-Bit x264 (64-Bit is used where supported)
-(b) Support for 8-Bit and 10-Bit H.264 encoding (default is 8-Bit)
-(c) Support for easy configuration using the x264 Preset/Tuning system
-    - Support for custom configuration Templates
-    - Support for custom x264 and Avs2YUV parameters
-(d) Support for native FFmpegSource2 input (AVI, MKV, MP4, FLV, etc.)
-(e) Support for batch encoding, i.e. enqueuing multiple encoding jobs
-    - Support for running multiple encoding jobs in parallel
-    - Support for shutting down the computer when all jobs are done
-(f) Support for Avisynth (.AVS) input
-    - Support for 32-Bit and 64-Bit Avisynth (default is 32-Bit)
-    - Support for using 64-Bit x264 in conjunction with 32-Bit Avisynth
-(g) Support for VapurSynth (.VPY) input
-(h) Support for MP4 and MKV output as well as "raw" H.264
-(i) Support for running the program in "portable" mode [see section 6]
-
-
-3. System Requirements
+2. System Requirements
 ----------------------
 
-(a) Windows XP with Service Pack 2 and later 
-(b) 64-Bit Windows is highly recommended, but 32-Bit Windows is okay
-(c) The CPU must support at least the MMX and SSE-1 instruction sets
-(d) Avisynth input only available with Avisynth 2.5+ installed
-(e) VapourSynth input only available with VapourSynth R19+ installed
-(f) YV16/YV24 color spaces require Avisynth 2.6 [see section 10]
+1. Windows XP with Service Pack 2 and later 
+2. 64-Bit Windows is highly recommended, but 32-Bit Windows is okay
+3. The CPU must support at least the MMX and SSE-1 instruction sets
+4. Avisynth input only available with Avisynth 2.5+ installed
+5. VapourSynth input only available with VapourSynth R19+ installed
+6. YV16/YV24 color spaces require Avisynth 2.6 [see section 10]
 
 100% standalone, does *not* require Mircrosoft.NET or other runtimes
 
 
-4. Anti-Virus Warning
+3. Anti-Virus Warning
 ---------------------
 
 Occasionally your Antivirus program may mistakenly detect "malware"
@@ -73,7 +50,7 @@ DON
 INFECTION WITH MULTIPLE ANTIVIRUS ENGNINES. THANKS!
 
 
-5. License
+4. License
 ----------
 
 This program is free software; you can redistribute it and/or modify
@@ -93,7 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 http://www.gnu.org/licenses/gpl-2.0.txt
 
 
-6. Portable Mode
+5. Portable Mode
 ----------------
 
 This application can be run in "portable" mode. Just rename the EXE
@@ -104,7 +81,7 @@ application directly from your USB stick on different computers. Note,
 however, that in portable mode the install folder must be writable!
 
 
-7. Updating Your x264 Binaries
+6. Updating Your x264 Binaries
 ------------------------------
 
 This application works best with the x264 binaries that are included in
@@ -122,7 +99,7 @@ Using old/outdated x264 binaries with this application is NOT supported
 or intended. Report bugs rather than reverting to an old version!
 
 
-8. Timeout Warning
+7. Timeout Warning
 ------------------
 
 This application provides "deadlock" prevention. This means that if an
@@ -139,7 +116,7 @@ long time to index the source file. In that case, we recommend to index
 the source file beforehand, e.g. by using the 'ffmsindex' tool.
 
 
-9. Custom Parameters
+8. Custom Parameters
 --------------------
 
 This application provides a "Custom Parameters" edit box. All command-
@@ -160,8 +137,8 @@ the "Custom Parameters" edit box and choose "Open the Text-Editor".
 This will open a multi-line text editor for easier parameter handling.
 
 
-10. Color Spaces / Chroma Subsampling
--------------------------------------
+9. Color Spaces / Chroma Subsampling
+------------------------------------
 
 Avs2YUV converts the output of your Avisynth script to the YV12 format,
 i.e. YUV data with 4:2:0 chroma subsampling and 8-Bit precision.
@@ -184,7 +161,7 @@ In short, to encode YUY2 from Avisynth, you have to pass "-csp I422" to
 Avs2YUV and "--output-csp i422" to x264 to avoid 4:2:0 downsampling.
 
 
-11. Audio Processing/Encoding
+10. Audio Processing/Encoding
 -----------------------------
 
 This application is a front-end to the x264 encoder. And, as x264 does
@@ -214,7 +191,7 @@ if you want to encode audio from an Avisynth script, you must pass the
 For convenience, the string "--audiofile $(INPUT)" may be used.
 
 
-12. OpenCL Support
+11. OpenCL Support
 -----------------------
 
 Newer builds of x264 now support OpenCL Lookahead, i.e. GPU accelerated
@@ -227,7 +204,7 @@ use the "--opencl" option. Therefore, the "dummy" OpenCL.DLL included
 in older versions of the Simple x264 Launcher is *NOT* needed anymore!!
 
 
-13. Command-line Syntax
+12. Command-line Syntax
 -----------------------
 
 PLEASE NOTE: These are parameters you can pass to Simple x264 Launcher, they
@@ -256,7 +233,7 @@ Some details on the "--add-job" command-line switch:
   If neither of those switches is used, the default startup behavior applies.
 
 
-14. Help & Support
+13. Help & Support
 ------------------
 
 For help and support, please join the discussion at:

diff --git a/etc/setup/license.rtf b/etc/setup/license.rtf
index ed3dc47..574a2b9 100644 (file)
Binary files a/etc/setup/license.rtf and b/etc/setup/license.rtf differ

diff --git a/gui/win_about.ui b/gui/win_about.ui
index a1acfbf..3a8ca59 100644 (file)
--- a/gui/win_about.ui
+++ b/gui/win_about.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>709</width>
+    <width>713</width>
     <height>275</height>
    </rect>
   </property>
@@ -223,7 +223,7 @@ Please check the web−site at &lt;a href=&quot;http://muldersoft.com/&quot;&gt;
               </font>
              </property>
              <property name="text">
-              <string>&lt;nobr&gt;&lt;tt&gt;&lt;b&gt;x264 - the best H.264/AVC encoder. Copyright (C) 2013-2014 x264 project.&lt;/b&gt;&lt;br&gt;
+              <string>&lt;nobr&gt;&lt;tt&gt;&lt;b&gt;x264 - the best H.264/AVC encoder. Copyright (C) 2003-2014 x264 project.&lt;/b&gt;&lt;br&gt;
 Free software library for encoding video streams into the H.264/MPEG-4 AVC format.&lt;br&gt;
 Released under the terms of the GNU General Public License, version 2.&lt;br&gt;
 &lt;br&gt;
@@ -329,7 +329,7 @@ Note: Simple x264 Launcher is not affiliated with or endorsed by the x264 projec
               </font>
              </property>
              <property name="text">
-              <string>&lt;nobr&gt;&lt;tt&gt;&lt;b&gt;x265 - free H.265/HEVC encoder. Copyright (C) 2003-2014 x265 project.&lt;/b&gt;&lt;br&gt;
+              <string>&lt;nobr&gt;&lt;tt&gt;&lt;b&gt;x265 - free H.265/HEVC encoder. Copyright (C) 2013-2014 x265 project.&lt;/b&gt;&lt;br&gt;
 Commercially funded, open source implementation of the HEVC compression standard.&lt;br&gt;
 Released under the terms of the GNU General Public License, version 2.&lt;br&gt;
 &lt;br&gt;

diff --git a/src/version.h b/src/version.h
index 76b2b88..78789b4 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 3
 #define VER_X264_PATCH 3
-#define VER_X264_BUILD 807
+#define VER_X264_BUILD 808
 
 #define VER_X264_PORTABLE_EDITION (0)
 

diff --git a/z_build.bat b/z_build.bat
index b60595f..7e95a0e 100644 (file)
--- a/z_build.bat
+++ b/z_build.bat
@@ -86,6 +86,7 @@ mkdir "%PACK_PATH%\imageformats"
 mkdir "%PACK_PATH%\toolset\x86"
 mkdir "%PACK_PATH%\toolset\x64"
 mkdir "%PACK_PATH%\toolset\common"
+mkdir "%PACK_PATH%\sources"
 copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%"
 copy "%~dp0\bin\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86"
 copy "%~dp0\bin\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86"
@@ -93,6 +94,7 @@ copy "%~dp0\bin\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64"
 copy "%~dp0\bin\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64"
 copy "%~dp0\bin\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common"
 copy "%~dp0\bin\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common"
+copy "%~dp0\etc\sources\*.tar" "%PACK_PATH%\sources"
 copy "%~dp0\*.txt" "%PACK_PATH%"
 
 REM ///////////////////////////////////////////////////////////////////////////