From 257bc707ece3f9949a8cfeb7cf369a8444d8e848 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 18 May 2013 13:45:10 +0000
Subject: [PATCH] WinGui: Merging latest fixes into QSV.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5476 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../ViewModels/OptionsViewModel.cs            |    6 +-
 .../HandBrakeWPF/ViewModels/QueueViewModel.cs |    2 +-
 win/CS/HandBrakeWPF/Views/AudioView.xaml      |    2 +-
 win/CS/HandBrakeWPF/Views/OptionsView.xaml    |    6 +-
 win/CS/HandBrakeWPF/Views/SubtitlesView.xaml  |    2 +-
 win/CS/build.xml                              |    2 +-
 win/CS/doc/CREDITS                            |    3 +-
 win/CS/doc/NEWS                               | 1228 +++++++++--------
 win/CS/doc/THANKS                             |    2 -
 9 files changed, 674 insertions(+), 579 deletions(-)

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 361094689..bde7bc38c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1464,13 +1464,13 @@ namespace HandBrakeWPF.ViewModels
             switch (this.userSettingService.GetUserSetting<int>(UserSettingConstants.DaysBetweenUpdateCheck))
             {
                 case 1:
-                    this.CheckForUpdatesFrequency = 1;
+                    this.CheckForUpdatesFrequency = 0;
                     break;
                 case 7:
-                    this.CheckForUpdatesFrequency = 2;
+                    this.CheckForUpdatesFrequency = 1;
                     break;
                 case 30:
-                    this.CheckForUpdatesFrequency = 3;
+                    this.CheckForUpdatesFrequency = 2;
                     break;
             }
 
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 79532b9ee..3b5bf33e8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -263,7 +263,7 @@ namespace HandBrakeWPF.ViewModels
             {
                 MessageBoxResult result =
                     this.errorService.ShowMessageBox(
-                        "This encode is currently in progress. If you delete it, the encode will be stoped. Are you sure you wish to proceed?",
+                        "This encode is currently in progress. If you delete it, the encode will be stopped. Are you sure you wish to proceed?",
                         "Warning",
                         MessageBoxButton.YesNo,
                         MessageBoxImage.Question);
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index c63346642..3cb8423a2 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -41,7 +41,7 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <Button Grid.Column="0"
-                    Width="75"
+                    MaxWidth="95"
                     Margin="0,0,10,0"
                     cal:Message.Attach="[Event Click] = [Action Add]"
                     Content="Add Track" />
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index c2e88150d..31fa1e8fd 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -251,8 +251,8 @@
 
                                 <DockPanel Grid.Column="1" Margin="10,0,10,0">
                                     <StackPanel Orientation="Vertical" VerticalAlignment="Center">
-                                        <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" Width="80" />
-                                        <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" Width="80" />    
+                                        <Button Content="Move Right"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveRight]" MaxWidth="90" />
+                                        <Button Content="Move Left"  VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageMoveLeft]" MaxWidth="90" />    
                                         <Button Content="Clear" VerticalAlignment="Center" Margin="0,0,0,5" cal:Message.Attach="[Event Click] = [Action LanguageClearAll]" Width="80"/>
                                     </StackPanel>
                                 </DockPanel>
@@ -402,7 +402,7 @@
                     <TextBlock Text="Updates" Grid.Column="0" FontSize="14" Margin="0,10,0,10"/>
 
                     <StackPanel Margin="20,0,0,0" Orientation="Horizontal">
-                        <Button Content="Check for Updates" Width="120" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />
+                        <Button Content="Check for Updates" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="[Event Click] = [Action PerformUpdateCheck]" />
                         <Button Content="Download Update" Width="120" cal:Message.Attach="[Event Click] = [Action DownloadUpdate]" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" />
                     </StackPanel>
                     
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index a99989189..cd8529937 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -41,7 +41,7 @@
                     cal:Message.Attach="[Event Click] = [Action Add]"
                     Content="Add" />
             <Button Grid.Column="2"
-                    Width="85"
+                    MaxWidth="100"
                     cal:Message.Attach="[Event Click] = [Action Import]"
                     Content="Import SRT" />
         </Grid>
diff --git a/win/CS/build.xml b/win/CS/build.xml
index 7d667af0d..f030e843e 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -75,7 +75,7 @@
   <Target Name="ReleasePostBuild">
     <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x86'" />
     <Exec Command="copy $(ProjectDir)HandBrakeWPF\Installer\Installer64.nsi $(ProjectDir)HandBrakeWPF\bin\Release /Y" Condition="$(Platform) == 'x64'" />
-    <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
+    <Exec Command="copy $(ProjectDir)HandBrakeWPF\handbrakepineapple.ico $(ProjectDir)HandBrakeWPF\bin\Release /Y" />
     <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)HandBrakeWPF\bin\Release\doc /I /Y" />
     <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer.nsi" Condition="$(Platform) == 'x86'" />
     <Exec Command="makensis $(ProjectDir)HandBrakeWPF\bin\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
diff --git a/win/CS/doc/CREDITS b/win/CS/doc/CREDITS
index 26ea7fc69..968f57f92 100644
--- a/win/CS/doc/CREDITS
+++ b/win/CS/doc/CREDITS
@@ -29,4 +29,5 @@ libmp4v2
 libmpeg2dec
 libpthreadsw32
 libx264
-libzlib
\ No newline at end of file
+libzlib
+fdk-aac
\ No newline at end of file
diff --git a/win/CS/doc/NEWS b/win/CS/doc/NEWS
index 96197d02e..dc8139f99 100644
--- a/win/CS/doc/NEWS
+++ b/win/CS/doc/NEWS
@@ -1,658 +1,717 @@
 NEWS file for HandBrake <http://handbrake.fr/>
 
+
+Changes betwen 0.9.8 and 0.9.9:
+
+    General
+     - Improved HandBrake pineapple icon by Matt Johnson
+     - Improved Retina-resolution icons within the application, by Nik Pawlak
+        + http://nikpawlak.com
+    Core
+     - Blu-ray (PGS) subtitle support
+        + works with Foreign Audio Search
+        + can be Burned-In
+        + can be passed through to MKV (but not MP4)
+     - Additional video framerates
+        + 30, 50, 59.94, 60 fps
+     - Double framerate ("bob") mode for the deinterlace and decomb filters
+     - Better audio remix support
+        + additional mixdowns: 6.1, 7.1, 7.1 (5F/2R/LFE)
+            CLI users should note 6ch becomes 5point1
+        + better-than-Stereo sources can be upmixed to 5.1
+        + discard one channel from Stereo sources
+            Mono (Left Only), Mono (Right Only)
+     - Allow the selection of higher audio bitrates where appropriate
+     - Allow the selection of lower audio samplerates where appropriate
+        + 8, 11.025, 12, 16 kHz
+     - Audio dithering (TPDF) when converting to 16-bit FLAC
+     - Use libavcodec for DTS audio decoding (instead of libdca)
+        + DTS-ES 6.1 Discrete support
+     - All graphical interfaces: support for x264's preset, tune and profile options
+        + alternative to the Advanced panel (which is still available)
+        + HandBrake-specific option to ensure compliance with a specific H.264 level
+     - Updated built-in presets
+        + take advantage of x264 preset/tune/profile support
+        + removed increasingly suboptimal and irrelevant Legacy presets
+     - Assorted bug fixes and improvements to the core library (libhb)
+     - Updated libraries
+        + x264 r2273-b3065e6
+        + Libav v9.6
+        + libbluray 0.2.3
+    Windows
+     - User Interface has been re-written in WPF
+        + Includes many small UI enhancements
+     - Switched to .NET 4 Client Profile
+        + smaller download for those who don't have .NET 4 Full installed
+    Mac
+     - Assorted bug fixes
+        + including better support for Retina displays
+     - Prevent sleep during encoding and scanning for Mountain Lion
+     - Drag & Drop files onto the Main window or application icon to scan
+     - Nicer progress indication on the dock icon
+     - Preview window improvements and bugfixes
+     - Updated Growl to 2.0.1
+        + Notification Center support (when Growl is not installed)
+    Linux
+     - Assorted bug fixes and improvements
+     - Use some system libraries rather than bundling
+        + fontconfig, freetype, libxml2, libass, libogg, libvorbis, libtheora and libsamplerate
+    Command Line Interface
+     - Audio option (-a) will ignore invalid input tracks and encode with only the valid ones
+     - Allow use of hh:mm:ss format when specifying p-to-p start/stop time
+     - Advanced audio options
+        + enable level normalization when downmixing (disabled by default)
+        + disable audio dithering or select a specific algorithm
+
+
+
+
 Changes betwen 0.9.7 and 0.9.8:
 
--> Corrects a few crash bugs that showed up in 0.9.7
+    - Corrects a few crash bugs that showed up in 0.9.7
 
-Changes betwen 0.9.6 and 0.9.7:
 
--> This is a bug fix release for 0.9.6.
--> Includes an AppleTV3 Preset and updated iPad Preset
 
+Changes betwen 0.9.6 and 0.9.7:
 
-Changes betwen 0.9.5 and 0.9.6:
+    - This is a bug fix release for 0.9.6.
+    - Includes an AppleTV3 Preset and updated iPad Preset
 
-Encoders:
----------
 
--> Video:
 
-   - updated libx264 (revision 2146)
-   - MPEG-2 encoder (from libavcodec)
-   - advanced options support for libavcodec encoders
-     format: option1=value1:option2=value2
-             -bf 2 -trellis 2 becomes bf=2:trellis=2
+Changes betwen 0.9.5 and 0.9.6:
 
--> Audio:
+    Encoders:
 
-   - audio gain control (increase/decrease audio volume)
+    -> Video:
 
-   - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
-   - new AAC encoder (from libavcodec) (considered experimental)
-     (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
-     (should be on par with faac in terms of quality, sometimes better)
-   - FLAC encoder (16-bit, MKV container only)
+       - updated libx264 (revision 2146)
+       - MPEG-2 encoder (from libavcodec)
+       - advanced options support for libavcodec encoders
+         format: option1=value1:option2=value2
+                 -bf 2 -trellis 2 becomes bf=2:trellis=2
 
-   - Mac OS X: HE-AAC encoding support, via Core Audio
+    -> Audio:
 
-   - quality-based variable bitrate encoding support
-     works with: Lame MP3, Vorbis, Core Audio AAC
-     only implemented in CLI and Linux GUI
+       - audio gain control (increase/decrease audio volume)
 
-   - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
+       - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
+       - new AAC encoder (from libavcodec) (considered experimental)
+         (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
+         (should be on par with faac in terms of quality, sometimes better)
+       - FLAC encoder (16-bit, MKV container only)
 
+       - Mac OS X: HE-AAC encoding support, via Core Audio
 
--> Audio Passthru:
+       - quality-based variable bitrate encoding support
+         works with: Lame MP3, Vorbis, Core Audio AAC
+         only implemented in CLI and Linux GUI
 
-   - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
-   - DTS-HD Passthru (MP4, MKV containers)
-   - MP3 Passthru (MP4, MKV containers)
-   - AAC Passthru (MP4, MKV containers)
-     (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
-      which will break playback in e.g. QuickTime Player)
-   - Auto Passthru: one encoder, multiple codecs
-     lets you define allowed codecs (from supported passthru codecs)
-     lets you pick a fallback encoder if passthru is not possible
+       - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
 
-Muxers:
--------
 
-   - start MKV clusters with a video keyframe whenever possible
-     should improve seeking and DLNA streaming
+    -> Audio Passthru:
 
-   - bug fix: use ISO 639-2 bibliographic form for MKV language codes
-   - bug fix: fix crash due to division by zero in MP4 muxer
-   - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
+       - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
+       - DTS-HD Passthru (MP4, MKV containers)
+       - MP3 Passthru (MP4, MKV containers)
+       - AAC Passthru (MP4, MKV containers)
+         (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
+          which will break playback in e.g. QuickTime Player)
+       - Auto Passthru: one encoder, multiple codecs
+         lets you define allowed codecs (from supported passthru codecs)
+         lets you pick a fallback encoder if passthru is not possible
 
-Decoders:
----------
+    Muxers:
+       - start MKV clusters with a video keyframe whenever possible
+         should improve seeking and DLNA streaming
 
--> Video:
+       - bug fix: use ISO 639-2 bibliographic form for MKV language codes
+       - bug fix: fix crash due to division by zero in MP4 muxer
+       - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
 
-   - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
-     frame-based multithreading for H.264, VP8
-     10-bit decoding support for H.264, DNxHD
-     Apple ProRes decoding support
-   - improved average framerate detection
-   - duplicate frame detection for improved frame drop decision (CFR/PFR)
-   - new Same as source, Constant Framerate option
-     for devices that don't support variable framerate
-     automatically picks a constant framerate closest to the detected average framerate
+    Decoders:
 
-   - bug fix: fix problem when resolution changes in the middle of a video stream
+    -> Video:
 
--> Audio:
+       - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
+         frame-based multithreading for H.264, VP8
+         10-bit decoding support for H.264, DNxHD
+         Apple ProRes decoding support
+       - improved average framerate detection
+       - duplicate frame detection for improved frame drop decision (CFR/PFR)
+       - new Same as source, Constant Framerate option
+         for devices that don't support variable framerate
+         automatically picks a constant framerate closest to the detected average framerate
 
-   - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
+       - bug fix: fix problem when resolution changes in the middle of a video stream
 
-   - bug fix: libavcodec-decoded streams can now be decoded multiple times
-              previously, multiple decodes of the same source tracks weren't possible
-              and audio output tracks had to be dropped
-   - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
-   - bug fix: fix DTS decoder audio volume (was too low)
-   - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
-   - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
+    -> Audio:
 
--> Subtitles:
+       - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
 
-   - updated libass (0.10.0)
-   - improved handling of subtitles with overlapping timestamps
-   - improved handling of DVD subtitles without Stop Display commands
-   - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
+       - bug fix: libavcodec-decoded streams can now be decoded multiple times
+                  previously, multiple decodes of the same source tracks weren't possible
+                  and audio output tracks had to be dropped
+       - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
+       - bug fix: fix DTS decoder audio volume (was too low)
+       - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
+       - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
 
-   - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
+    -> Subtitles:
 
-Demuxers:
----------
+       - updated libass (0.10.0)
+       - improved handling of subtitles with overlapping timestamps
+       - improved handling of DVD subtitles without Stop Display commands
+       - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
 
-   - improved MPEG Program/Transport stream support
-     support for MPEG-1 Program streams
-     support for HD-DVD EVOB streams
-     improved handling of Transport streams that have no PCR
-   - WTV container support (via libavformat)
+       - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
 
-   - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
-   - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
-   - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
+    Demuxers:
 
-Filters:
---------
+       - improved MPEG Program/Transport stream support
+         support for MPEG-1 Program streams
+         support for HD-DVD EVOB streams
+         improved handling of Transport streams that have no PCR
+       - WTV container support (via libavformat)
 
-   - new, much improved decomb filter (but slower)
-     new settings are default
-     old settings become decomb "Fast"
+       - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
+       - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
+       - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
 
-Presets:
---------
+    Filters:
 
-   - improved "Normal" preset (much faster, similar file size and quality)
-   - removed obsolete legacy presets
-   - added new device presets for Android phones/tablets
-     recent and/or powerful devices recommended
+       - new, much improved decomb filter (but slower)
+         new settings are default
+         old settings become decomb "Fast"
 
-Mac OS X:
----------
+    Presets:
 
--> DVD decryption:
+       - improved "Normal" preset (much faster, similar file size and quality)
+       - removed obsolete legacy presets
+       - added new device presets for Android phones/tablets
+         recent and/or powerful devices recommended
 
-   - VLC 2.x or later will not work for DVD decryption
-     and is therefore unsupported as of HandBrake 0.9.6
-   - libdvdcss is now the preferred method for DVD decryption
-     already works with HandBrake 0.9.5
-     a .pkg installer is available from Videolan:
-     http://download.videolan.org/libdvdcss/last/macosx/
+    Mac OS X:
 
--> Build system:
+    -> DVD decryption:
 
-   - support for Xcode 4 and Mac OS X 10.7 "Lion"
-   - Mac OS X 10.5 "Leopard" no longer supported
+       - VLC 2.x or later will not work for DVD decryption
+         and is therefore unsupported as of HandBrake 0.9.6
+       - libdvdcss is now the preferred method for DVD decryption
+         already works with HandBrake 0.9.5
+         a .pkg installer is available from Videolan:
+         http://download.videolan.org/libdvdcss/last/macosx/
 
-Mac OS X GUI:
--------------
+    -> Build system:
 
--> OS X 10.7 Lion support:
+       - support for Xcode 4 and Mac OS X 10.7 "Lion"
+       - Mac OS X 10.5 "Leopard" no longer supported
 
-   - bug fix: Live Preview window widgets updated to work under Lion
-   - bug fix: fixed positioning of widgets in the Audio panel under Lion
+    Mac OS X GUI:
 
--> Other:
+    -> OS X 10.7 Lion support:
 
-   - wider main window providing more room for various widgets
+       - bug fix: Live Preview window widgets updated to work under Lion
+       - bug fix: fixed positioning of widgets in the Audio panel under Lion
 
-Windows GUI:
-------------
+    -> Other:
 
--> Preview window:
+       - wider main window providing more room for various widgets
 
-   - complete redesign
-   - support for VLC or the system default video player
-   - dropped built-in QuickTime playback support
+    Windows GUI:
+    -> Preview window:
 
--> Other:
+       - complete redesign
+       - support for VLC or the system default video player
+       - dropped built-in QuickTime playback support
 
-   - much improved control over the default audio and subtitle tracks selected (see Options)
-   - ability to set the minimal title length that will show up during a scan (see Options)
-   - several other usability improvements
-   - installer now has a silent option for easier network installs (launch the installer with /S)
+    -> Other:
 
-Linux GUI:
-----------
+       - much improved control over the default audio and subtitle tracks selected (see Options)
+       - ability to set the minimal title length that will show up during a scan (see Options)
+       - several other usability improvements
+       - installer now has a silent option for easier network installs (launch the installer with /S)
 
--> Audio panel:
+    Linux GUI:
+    -> Audio panel:
 
-   - new advanced audio options section for gain and audio track names
-   - dynamic range compression and samplerate moved to advanced audio options
+       - new advanced audio options section for gain and audio track names
+       - dynamic range compression and samplerate moved to advanced audio options
 
--> Other:
+    -> Other:
 
-   - minor UI tweaks and usability enhancements
+       - minor UI tweaks and usability enhancements
 
-Miscellaneous:
---------------
+    Miscellaneous:
+       - Target Size is gone, and isn't coming back
+         Don't bother complaining on the forums
 
-   - Target Size is gone, and isn't coming back
-     Don't bother complaining on the forums
+       - CLI: support for x264 presets, tunes and profiles
+         new --x264-preset, --x264-tune and --x264-profile options
 
-   - CLI: support for x264 presets, tunes and profiles
-     new --x264-preset, --x264-tune and --x264-profile options
+       - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
+       - DVD: improved main feature detection
 
-   - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
-   - DVD: improved main feature detection
+       - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
 
-   - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
 
 
 Changes between 0.9.4 and 0.9.5:
 
-* Core Library
-  - BluRay disc structure support. (No decryption support) 
-  - Updated Libraries (x264, ffmpeg) 
-  - SSA Subtitle support. (Including burn-in) 
-  - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
-  - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
-  - Updated Presets for newer devices and better quality 
-  - AC3 encoding support.
-  - Many Bug fixes and other small improvements
-  - Improved DVD Main Feature detection (when using dvdnav)
-  - Universal audio downmix support (all audio types can be downmixed)
-
-*All GUIs
-  - Updated x264 Advanced Panel
-  - Video Quality Slider drops % value and only shows RF for x264
-  - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
-  - Peak framerate option (Capped VFR)
-  - Many Bug fixes
-  - Many Tweaks to improve usability.
-  - Ability to edit queue jobs
-  - Point-to-Point encoding (second or frame start and end times)
-
-* Mac GUI
-  - New Audio Panel supporting >4 Audio Tracks
-  - VLC detection in /Applications and ~/Applications
-
-* Windows GUI
-  - Encode Status in GUI. (CLI window is now always hidden)
-  - Improved Auto-Naming for Destination file name.
-  - Drag / Drop Video onto Main Window to scan.
+    * Core Library
+      - BluRay disc structure support. (No decryption support) 
+      - Updated Libraries (x264, ffmpeg) 
+      - SSA Subtitle support. (Including burn-in) 
+      - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
+      - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
+      - Updated Presets for newer devices and better quality 
+      - AC3 encoding support.
+      - Many Bug fixes and other small improvements
+      - Improved DVD Main Feature detection (when using dvdnav)
+      - Universal audio downmix support (all audio types can be downmixed)
+
+    *All GUIs
+      - Updated x264 Advanced Panel
+      - Video Quality Slider drops % value and only shows RF for x264
+      - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
+      - Peak framerate option (Capped VFR)
+      - Many Bug fixes
+      - Many Tweaks to improve usability.
+      - Ability to edit queue jobs
+      - Point-to-Point encoding (second or frame start and end times)
+
+    * Mac GUI
+      - New Audio Panel supporting >4 Audio Tracks
+      - VLC detection in /Applications and ~/Applications
+
+    * Windows GUI
+      - Encode Status in GUI. (CLI window is now always hidden)
+      - Improved Auto-Naming for Destination file name.
+      - Drag / Drop Video onto Main Window to scan.
+      
+    * Linux GUI
+      - Multiple instance support (run multiple copies of ghb at once)
+      - Many Bug fixes and UI improvements. 
   
-* Linux GUI
-  - Multiple instance support (run multiple copies of ghb at once)
-  - Many Bug fixes and UI improvements. 
-  
-Changes between 0.9.3 and 0.9.4:
 
-Core:
-
-* New build system, allowing 64-bit binaries (around 10% faster)
-* Soft subtitles and Closed Captions:
-  - DVD Closed Captions
-  - ATSC Closed Captions
-  - SRT subtitle import
-  - Text soft subtitles in MP4 and MKV output
-  - Bitmap soft subtitles in MKV output
-* Better support for DVD inputs:
-  - Uses libdvdnav
-  - DVD angles support
-  - Workaround for libdvdread malloc bomb on invalid PGC entry
-  - DVD drive region detection support in Linux
-  - Handles DVD programs with more than 16 streams
-  - No longer tries to detect and discard duplicate titles when scanning
-  - Libdvdnav patched to perform read error recovery
-  - Libdvdread patched to allow raw device access in Windows
-  - Handles poorly mastered DVDs that had the menus ripped out of them
-* Better support for non-DVD inputs:
-  - Preserves MP4 metadata
-  - TrueHD
-  - DTS-HD demuxing
-  - 8 bit audio
-  - Better handling of transport streams where audio starts first
-  - Better handling of transport streams that have been spliced together, leading to duplicate timestamps
-  - Better VC-1 frame detection
-  - Fixes bug that was causing one sec. of audio to be dropped on many ffmpeg files
-  - Looks harder for aspect ratio info from DV sources
-  - No longer truncates the last (dummy) chapter
-  - Allows specifying field parity for detelecine and decomb
-* Better AV sync
-* Support for sources with no audio
-* DTS passthrough for MKV
-* x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset). 
-* Better sample interleaving
-* Better, optional deinterlacer for decomb (EEDI2)
-* New mode structure for the decomb filter
-* Variable verbose logging levels
-* Fixed timing for first two frames coming out of filters
-* Libtheora bumped to 1.1.0
-* Improvements to our theora implementation (2 pass encoding + soft target rate control)
-* Caters to Theora's insistence on content having mod16 framing dimensions specified
-* Flushes LAME encoder's final packets
-* Fixed interjob framerate calculation
-* Fixed pthreads regression in cygwin
-* Tweaks for packaging tools
-* Solaris 10 build support
-
-All interfaces:
-
-* Live video preview
-* New subtitle tab
-* New filters and picture settings inspector
-* Custom anamorphic mode
-* Updated Sparkle
-* Custom number of preview images
-* Quality slider now works off actual rate factor/quantizer values instead of percentages
-* Partially updated advanced x264 tab
-* New built-in presets
-* Use libdvdnav by default on DVD sources
-* Removed Constant QP encoding option for x264 (use CRF)
-* Various bug fixes and UI tweaks
-* x264 turbo 1st pass mode now uses subme=2 not subme=1
-
-Mac:
-
-* Core Audio AAC encoding
-* H.264 video source decoding crash fixed
-* Queue displays varying row heights based on encode settings
-* Fixed EyeTV package scanning
-* 64bit / 32 bit VLC detection 
-* Preset import/export
-
-Windows:
-
-* New audio tab
-* AAC audio source decoding bug fixed
-* Tray minimization is now optional
-* Queue can now be started from main window
-* Growl for Windows notification support
-* General UI improvements
-* Preset import
-* Preferred language control for audio dubs and subtitles
-* Fixed file extensions resetting to m4v when enabling chapter markers in mkv
-* Faster updating of GUI elements from CLI data
-* Cleanup / Improved some of the programs options. (Growl, use m4v, drive detection)
-* Numerous fixes in the Picture Settings Panel and CLI Query Handling code.
-* Bug Fixes and Usability improvements.
-
-Linux:
-
-* General UI improvements
-* Inhibits sleep mode while encoding
-* Single title scan
-* Chapter duration display
-* Notifications when encodes complete
-* Tray minimization
-* Full screen preview
-* Preset import/export
-* Preferred language control for audio dubs and subtitles
-* Preferences rearrangement
-* Preference to auto-apply .m4v extension
-* New system tray icon behavior
-* Preference for what to do when encode completes
-* Preference for how often to delete activity logs
-* Preference to disable automatic scanning
-* New Gnome session manager support
-* Improved "auto" audio selection
-* Use .m4v as the default extension for the MPEG-4 container
-* Use .m4v when soft subs are enabled
-* Alternate angle encoding fix
-* Only strips drive letters for Windows builds
-* Show correct audio format info when it's been sanitized for incompatibilities
-* Preserve chapter list modifications made to queued jobs
-* Fixed error when navigating chapter titles with the keyboard
-* Bug Fixes.
-
-CLI:
-
-* Options to handle new subtitle, anamorphic, and preview features
-* --srt-file, --srt-codeset, --srt-offset, --srt-lang, --srt-default
-* --native-dub option lets users request dubbing instead of subs when the audio isn't in their native language
-* Allow encoding sources with no audio without explicitly stating -a none
-* Update checker on MinGW built exe should now work correctly.
-* Matches GUIs' default verbosity level of 1
+
+Changes between 0.9.3 and 0.9.4:
+    Core:
+
+    * New build system, allowing 64-bit binaries (around 10% faster)
+    * Soft subtitles and Closed Captions:
+      - DVD Closed Captions
+      - ATSC Closed Captions
+      - SRT subtitle import
+      - Text soft subtitles in MP4 and MKV output
+      - Bitmap soft subtitles in MKV output
+    * Better support for DVD inputs:
+      - Uses libdvdnav
+      - DVD angles support
+      - Workaround for libdvdread malloc bomb on invalid PGC entry
+      - DVD drive region detection support in Linux
+      - Handles DVD programs with more than 16 streams
+      - No longer tries to detect and discard duplicate titles when scanning
+      - Libdvdnav patched to perform read error recovery
+      - Libdvdread patched to allow raw device access in Windows
+      - Handles poorly mastered DVDs that had the menus ripped out of them
+    * Better support for non-DVD inputs:
+      - Preserves MP4 metadata
+      - TrueHD
+      - DTS-HD demuxing
+      - 8 bit audio
+      - Better handling of transport streams where audio starts first
+      - Better handling of transport streams that have been spliced together, leading to duplicate timestamps
+      - Better VC-1 frame detection
+      - Fixes bug that was causing one sec. of audio to be dropped on many ffmpeg files
+      - Looks harder for aspect ratio info from DV sources
+      - No longer truncates the last (dummy) chapter
+      - Allows specifying field parity for detelecine and decomb
+    * Better AV sync
+    * Support for sources with no audio
+    * DTS passthrough for MKV
+    * x264 bumped from r1169 to r1347, which means speed optimizations, new default settings (see r2742 commit comment), the magic of macroblock tree rate control (mbtree), a new CRF curve (meaning you will get different, generally lower bitrates at the same RF, with similar quality metrics), and weighted P-Frames (disabled by default for Baseline encodes and the AppleTV preset). 
+    * Better sample interleaving
+    * Better, optional deinterlacer for decomb (EEDI2)
+    * New mode structure for the decomb filter
+    * Variable verbose logging levels
+    * Fixed timing for first two frames coming out of filters
+    * Libtheora bumped to 1.1.0
+    * Improvements to our theora implementation (2 pass encoding + soft target rate control)
+    * Caters to Theora's insistence on content having mod16 framing dimensions specified
+    * Flushes LAME encoder's final packets
+    * Fixed interjob framerate calculation
+    * Fixed pthreads regression in cygwin
+    * Tweaks for packaging tools
+    * Solaris 10 build support
+
+    All interfaces:
+
+    * Live video preview
+    * New subtitle tab
+    * New filters and picture settings inspector
+    * Custom anamorphic mode
+    * Updated Sparkle
+    * Custom number of preview images
+    * Quality slider now works off actual rate factor/quantizer values instead of percentages
+    * Partially updated advanced x264 tab
+    * New built-in presets
+    * Use libdvdnav by default on DVD sources
+    * Removed Constant QP encoding option for x264 (use CRF)
+    * Various bug fixes and UI tweaks
+    * x264 turbo 1st pass mode now uses subme=2 not subme=1
+
+    Mac:
+
+    * Core Audio AAC encoding
+    * H.264 video source decoding crash fixed
+    * Queue displays varying row heights based on encode settings
+    * Fixed EyeTV package scanning
+    * 64bit / 32 bit VLC detection 
+    * Preset import/export
+
+    Windows:
+
+    * New audio tab
+    * AAC audio source decoding bug fixed
+    * Tray minimization is now optional
+    * Queue can now be started from main window
+    * Growl for Windows notification support
+    * General UI improvements
+    * Preset import
+    * Preferred language control for audio dubs and subtitles
+    * Fixed file extensions resetting to m4v when enabling chapter markers in mkv
+    * Faster updating of GUI elements from CLI data
+    * Cleanup / Improved some of the programs options. (Growl, use m4v, drive detection)
+    * Numerous fixes in the Picture Settings Panel and CLI Query Handling code.
+    * Bug Fixes and Usability improvements.
+
+    Linux:
+
+    * General UI improvements
+    * Inhibits sleep mode while encoding
+    * Single title scan
+    * Chapter duration display
+    * Notifications when encodes complete
+    * Tray minimization
+    * Full screen preview
+    * Preset import/export
+    * Preferred language control for audio dubs and subtitles
+    * Preferences rearrangement
+    * Preference to auto-apply .m4v extension
+    * New system tray icon behavior
+    * Preference for what to do when encode completes
+    * Preference for how often to delete activity logs
+    * Preference to disable automatic scanning
+    * New Gnome session manager support
+    * Improved "auto" audio selection
+    * Use .m4v as the default extension for the MPEG-4 container
+    * Use .m4v when soft subs are enabled
+    * Alternate angle encoding fix
+    * Only strips drive letters for Windows builds
+    * Show correct audio format info when it's been sanitized for incompatibilities
+    * Preserve chapter list modifications made to queued jobs
+    * Fixed error when navigating chapter titles with the keyboard
+    * Bug Fixes.
+
+    CLI:
+
+    * Options to handle new subtitle, anamorphic, and preview features
+    * --srt-file, --srt-codeset, --srt-offset, --srt-lang, --srt-default
+    * --native-dub option lets users request dubbing instead of subs when the audio isn't in their native language
+    * Allow encoding sources with no audio without explicitly stating -a none
+    * Update checker on MinGW built exe should now work correctly.
+    * Matches GUIs' default verbosity level of 1
 
 Changes between 0.9.2 and 0.9.3:
 
 0.9.3 Snapshot 5 -> 0.9.3 Final
-- Better PMT processing
-- Basic underlying support for live previews (encode from a seek point for a set number of frames)
-- Better searching for IDR frames in H.264 streams
-- Preset changes (iPhone goes CRF, some old Apple presets resurrected as Legacy)
-- Assorted bug fixes
+    - Better PMT processing
+    - Basic underlying support for live previews (encode from a seek point for a set number of frames)
+    - Better searching for IDR frames in H.264 streams
+    - Preset changes (iPhone goes CRF, some old Apple presets resurrected as Legacy)
+    - Assorted bug fixes
 
 0.9.3 Snapshot 4 -> 0.9.3 Snapshot 5 (r1913)
-Core Library
-- VC-1 stream input
-- Newer libmp4v2, which fixes the issue with output > 2 gigs in Linux
-- Proper allocation for preview frames
-- Avoids corruption of previews of sources that use widths that aren't cleanly divisible by 8
-- Decodes DTS internally instead of using ffmpeg, to allow mixdowns
-- Better support for DTS in MKV files with implicit timestamps or large timestamp errors
-- Ensures proper chroma size by rounding up when dealing with odd dimensions
-- Ensures "auto" samplerate sends a valid value to faac (22050, 24000, 32000, 44100, or 48000)
-- Bumped Theora to 1.0 final
-- Bumped x264 to r1024, which includes Nehalem optimizations as well as speed boosts for things such as b-adapt=2
-
-Mac GUI
-- Allows multibyte characters in chapter titles
-
-Windows GUI
-- Fixes issue parsing presets that use maxWidth and maxHeight (-X and -Y)
-- DRC defaults to 1 now
-- Chapter markers disabled for non-DVD sources
-- Makes sure Normal preset gets loaded
-- Fixes arithmetic overflow crash when scanning
-
-Linux GUI
-- Update checker
-- Limits range of chapters to encode to the number of chapters on the DVD
-- Disabled entry of dimensions larger than the source
-
-CLI
-- Allows overriding of audio (tracks, bitrates, samplerates, codecs, mixdowns) and x264 options in built-in presets
-
-Documentation
-- Documentation updates have begun on the wiki, although they are not yet complete
+    Core Library
+    - VC-1 stream input
+    - Newer libmp4v2, which fixes the issue with output > 2 gigs in Linux
+    - Proper allocation for preview frames
+    - Avoids corruption of previews of sources that use widths that aren't cleanly divisible by 8
+    - Decodes DTS internally instead of using ffmpeg, to allow mixdowns
+    - Better support for DTS in MKV files with implicit timestamps or large timestamp errors
+    - Ensures proper chroma size by rounding up when dealing with odd dimensions
+    - Ensures "auto" samplerate sends a valid value to faac (22050, 24000, 32000, 44100, or 48000)
+    - Bumped Theora to 1.0 final
+    - Bumped x264 to r1024, which includes Nehalem optimizations as well as speed boosts for things such as b-adapt=2
+
+    Mac GUI
+    - Allows multibyte characters in chapter titles
+
+    Windows GUI
+    - Fixes issue parsing presets that use maxWidth and maxHeight (-X and -Y)
+    - DRC defaults to 1 now
+    - Chapter markers disabled for non-DVD sources
+    - Makes sure Normal preset gets loaded
+    - Fixes arithmetic overflow crash when scanning
+
+    Linux GUI
+    - Update checker
+    - Limits range of chapters to encode to the number of chapters on the DVD
+    - Disabled entry of dimensions larger than the source
+
+    CLI
+    - Allows overriding of audio (tracks, bitrates, samplerates, codecs, mixdowns) and x264 options in built-in presets
+
+    Documentation
+    - Documentation updates have begun on the wiki, although they are not yet complete
 
 0.9.3 Snapshot 3 -> 0.9.3 Snapshot 4 (r1896)
-Core Library
-- Converts video in other color spaces to YUV420 (this means DV support)
-- Official, standards-based AC3-in-MP4
-- Tries to base the AV timing for streams off audio when possible
-- Keeps some audio fixes for lost packets in over the air streams from interfering with other sources
-- Handles rendering of sources where the picture resolution changes mid-stream (this fixes the long-standing bug reading a particular episode of Doctor Who)
-- Wider window for clock references (AV sync)
-- Fixed a crash when closing out data for AAC encoding on aborted encodes
-- Rejiggered verbose activity log display to be more laconic by default
-- Updated x264 to r1016, which means b-rdo and bime are gone and replaced with new subme modes
-- DTS and HDMV DTS audio support in streams
-- Doesn't show the audio track button on iPhones/iPod Touches unless there's more than 1 track
-- Tries to avoid garbage data from AC3 sync by searching for two agreeing packets
-- As the MPEG4IP project is defunct, switched to an independently maintained libmp4v2 which has folded in all our cumbersome patches
-- Fixed SunOS compilation
-- Fixed conflict between maxHeight and maxWidth and loose anamorphic
-- Warn in the log when titles are being ignored during scan for lack of audio
-- Fixed bug with Slow/Slowest deinterlacing and decomb which could leave a flickering line at the top or bottom of the screen
-- Extracts audio and subtitle types from DVD sources, to do things like label commentary tracks
-- Better handling of the beginning of AVI and WMV sources that start after time 0
-- Optimize MP4 for web download works with AC3 tracks now
-
-Mac GUI
-- Nested presets
-- Individual activity logs for each encode (stored by default in ~/Application Support/HandBrake, can be co-located with encoded file destination by preference)
-- Allows reading from ZFS volumes
-- Fixed target size mode. It keeps breaking itself. Maybe it should just be put out of its misery...
-- Assorted other improvements
-
-Windows GUI
-- Nested presets
-- Individual activity logs for each encode
-- Slow and slower deinterlacing and decomb work now in Windows
-- Added resizeable update window
-- Fixed parsing of non-DVD source audio formats
-- Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
-- Fixed bug with MKV presets showing up as .m4v
-- Assorted other improvements
-
-Linux GUI (GTK)
-- Nested presets
-- Individual activity logs for each encode
-- Allows pending queue items to be removed, and reloaded in the main window for editing
-- Better handling of HD previews
-- Assorted other improvements
-
-CLI
-- Updated presets to the equivalent of the nested ones in the GUIs
-- Allows setting custom audio track names in MP4 files
-- Allows selection of the COLR atom in MP4 files, between Bt.601 and Bt.709
-- Fixed reading of device paths in OS X
-
-A special note on the new presets (they're collapsible-triangle-folder-thing-errific!)
-- Deux Six Quatre, Blind, Broke, and Bedlam are gone. They were dead weight.
-- iPod Low-Rez is now iPod Classic & iPod Nano
-- iPod High-Rez is now iPod Legacy
-- iPhone / iPod Touch is now iPhone & iPod Touch, so take care CLI users
-- Animation and Television now use the decomb and detelecine (VFR) filters
-- High Profile presets now use psy-trellis and the new subme 9 mode with B-frame RD refinement
-- AppleTV is now CRF, so sizes will vary with content
-- PS3 preset should be fixed
-- Constant Quality Rate still needs its quality % lowered, probably
-
-The keen reader is already asking "iPod Legacy? WTF is iPod High-Rez called iPod Legacy now?"
-
-The answer is Universal.
-
-The Universal preset is designed to play on all modern iPods (anything newer than the iPod 5.5G). It also plays on iPhones. It also plays on AppleTVs. It should also play just about anywhere else, hence the name. It is full anamorphic DVD resolution--no tricks with downscaling like stuff from the iTunes Store. It includes chapters, and has the first audio track in both AAC (DPL2 downmixed) and AC3 pass-thru, just like the AppleTV preset. In fact, it should give the same quality as the AppleTV preset, but faster...and at a larger file size. Like the AppleTV preset, it used CRF, so sizes will vary.
+    Core Library
+    - Converts video in other color spaces to YUV420 (this means DV support)
+    - Official, standards-based AC3-in-MP4
+    - Tries to base the AV timing for streams off audio when possible
+    - Keeps some audio fixes for lost packets in over the air streams from interfering with other sources
+    - Handles rendering of sources where the picture resolution changes mid-stream (this fixes the long-standing bug reading a particular episode of Doctor Who)
+    - Wider window for clock references (AV sync)
+    - Fixed a crash when closing out data for AAC encoding on aborted encodes
+    - Rejiggered verbose activity log display to be more laconic by default
+    - Updated x264 to r1016, which means b-rdo and bime are gone and replaced with new subme modes
+    - DTS and HDMV DTS audio support in streams
+    - Doesn't show the audio track button on iPhones/iPod Touches unless there's more than 1 track
+    - Tries to avoid garbage data from AC3 sync by searching for two agreeing packets
+    - As the MPEG4IP project is defunct, switched to an independently maintained libmp4v2 which has folded in all our cumbersome patches
+    - Fixed SunOS compilation
+    - Fixed conflict between maxHeight and maxWidth and loose anamorphic
+    - Warn in the log when titles are being ignored during scan for lack of audio
+    - Fixed bug with Slow/Slowest deinterlacing and decomb which could leave a flickering line at the top or bottom of the screen
+    - Extracts audio and subtitle types from DVD sources, to do things like label commentary tracks
+    - Better handling of the beginning of AVI and WMV sources that start after time 0
+    - Optimize MP4 for web download works with AC3 tracks now
+
+    Mac GUI
+    - Nested presets
+    - Individual activity logs for each encode (stored by default in ~/Application Support/HandBrake, can be co-located with encoded file destination by preference)
+    - Allows reading from ZFS volumes
+    - Fixed target size mode. It keeps breaking itself. Maybe it should just be put out of its misery...
+    - Assorted other improvements
+
+    Windows GUI
+    - Nested presets
+    - Individual activity logs for each encode
+    - Slow and slower deinterlacing and decomb work now in Windows
+    - Added resizeable update window
+    - Fixed parsing of non-DVD source audio formats
+    - Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
+    - Fixed bug with MKV presets showing up as .m4v
+    - Assorted other improvements
+
+    Linux GUI (GTK)
+    - Nested presets
+    - Individual activity logs for each encode
+    - Allows pending queue items to be removed, and reloaded in the main window for editing
+    - Better handling of HD previews
+    - Assorted other improvements
+
+    CLI
+    - Updated presets to the equivalent of the nested ones in the GUIs
+    - Allows setting custom audio track names in MP4 files
+    - Allows selection of the COLR atom in MP4 files, between Bt.601 and Bt.709
+    - Fixed reading of device paths in OS X
+
+    A special note on the new presets (they're collapsible-triangle-folder-thing-errific!)
+    - Deux Six Quatre, Blind, Broke, and Bedlam are gone. They were dead weight.
+    - iPod Low-Rez is now iPod Classic & iPod Nano
+    - iPod High-Rez is now iPod Legacy
+    - iPhone / iPod Touch is now iPhone & iPod Touch, so take care CLI users
+    - Animation and Television now use the decomb and detelecine (VFR) filters
+    - High Profile presets now use psy-trellis and the new subme 9 mode with B-frame RD refinement
+    - AppleTV is now CRF, so sizes will vary with content
+    - PS3 preset should be fixed
+    - Constant Quality Rate still needs its quality % lowered, probably
+
+    The keen reader is already asking "iPod Legacy? WTF is iPod High-Rez called iPod Legacy now?"
+
+    The answer is Universal.
+
+    The Universal preset is designed to play on all modern iPods (anything newer than the iPod 5.5G). It also plays on iPhones. It also plays on AppleTVs. It should also play just about anywhere else, hence the name. It is full anamorphic DVD resolution--no tricks with downscaling like stuff from the iTunes Store. It includes chapters, and has the first audio track in both AAC (DPL2 downmixed) and AC3 pass-thru, just like the AppleTV preset. In fact, it should give the same quality as the AppleTV preset, but faster...and at a larger file size. Like the AppleTV preset, it used CRF, so sizes will vary.
 
 0.9.3 Snapshot2 -> 0.9.3 Snapshot 3 (r1797)
-Core Library:
-- Universal input support, utilizing libavcodec from the FFmpeg project for decoding non-MPEG-2 video
-- Newer, faster, better version of the x264 codec, including psychovisual optimizations
-- Better AV sync through full compliance with the MPEG Standard Target Decoder timing model
-- More accurate auto-cropping
-- Support for New Zealand and Norwegian HDTV broadcasts (H.264 and AAC-LATM in MPEG-TS)
-- Detelecine is now "VFR detelecine" by default, dropping some frames and extending others to make up lost time, old behavior of keeping duplicate frames is enabled by selecting a framerate besides "Same as source"
-- Threaded deinterlacing in Slow and Slower modes
-- Threaded and entirely rewritten decomb filter
-- Better audio resampling interpolator
-- Better gamma in QuickTime through the use of the COLR MP4 atom
-- Better constant quality encoding when using FFmpeg
-- Hopefully better cache and virtual memory performance by recycling buffers that were most recently used instead of least
-- Fix for MP4s with "negative duration" errors.
-- Set the detelecine filter to work better with PAL by using "loose" breaks
-- Fix for missing initial H.264 NAL units, improves reliability of 8x8dct
-- Fix for subtitle-scan with XviD encoding
-- Fix for crash at the end of 2nd pass using x264
-- Deblock filter works now
-- Rewritten update system, so the core library can read a portion of Sparkle appcasts.
-- Updates for libsamplerate, libogg, xvidcore, libtheora, libmpeg2, lame, faac, and of course ffmpeg and x264.
-
-Mac GUI
-- Entirely rewritten and far more flexible queue that can be saved between sessions, capable of preserving queued items after a crash
-- Now requires vlc 0.9.xx to read protected dvd's in the users /Applications folder
-- Fix for 4x3 loose anamorphic to keep it from downscaling
-- Countless other improvements
-
-Windows GUI
-- Resolution calculation
-- Better preset bar
-- Better queue (including queue recovery feature)
-- Better activity log window
-- Improved UI (layout changes, animated x264 options, DVD drive detection, duration displayed)
-- More options - includes support for custom auto name format & starting the CLI minimized
-- Countless other improvements
-
-Linux GUI (GTK)
-- It's alive!
-
-Known Issues in Snapshot 3
-- Possibility of a flickering line at the top or bottom of the frame after Slow or Slower deinterlacing or decombing
-- Input bitrate display may be off by a factor of 100 for H.264-in-TS sources
-- Constant Quality Rate preset probably needs a lower quality level (60% - 55%)
-- With non-DVD sources that don't have AC3 audio, you can't encode 1 input audio track to multiple output audio tracks
-- Slow and Slower deinterlacing and decombing are BROKEN in Windows
-- QuickTime won't read Xvid-in-MP4 output, although VLC will
-- Windows GUI does not detect all audio tracks from non-DVD sources
+    Core Library:
+    - Universal input support, utilizing libavcodec from the FFmpeg project for decoding non-MPEG-2 video
+    - Newer, faster, better version of the x264 codec, including psychovisual optimizations
+    - Better AV sync through full compliance with the MPEG Standard Target Decoder timing model
+    - More accurate auto-cropping
+    - Support for New Zealand and Norwegian HDTV broadcasts (H.264 and AAC-LATM in MPEG-TS)
+    - Detelecine is now "VFR detelecine" by default, dropping some frames and extending others to make up lost time, old behavior of keeping duplicate frames is enabled by selecting a framerate besides "Same as source"
+    - Threaded deinterlacing in Slow and Slower modes
+    - Threaded and entirely rewritten decomb filter
+    - Better audio resampling interpolator
+    - Better gamma in QuickTime through the use of the COLR MP4 atom
+    - Better constant quality encoding when using FFmpeg
+    - Hopefully better cache and virtual memory performance by recycling buffers that were most recently used instead of least
+    - Fix for MP4s with "negative duration" errors.
+    - Set the detelecine filter to work better with PAL by using "loose" breaks
+    - Fix for missing initial H.264 NAL units, improves reliability of 8x8dct
+    - Fix for subtitle-scan with XviD encoding
+    - Fix for crash at the end of 2nd pass using x264
+    - Deblock filter works now
+    - Rewritten update system, so the core library can read a portion of Sparkle appcasts.
+    - Updates for libsamplerate, libogg, xvidcore, libtheora, libmpeg2, lame, faac, and of course ffmpeg and x264.
+
+    Mac GUI
+    - Entirely rewritten and far more flexible queue that can be saved between sessions, capable of preserving queued items after a crash
+    - Now requires vlc 0.9.xx to read protected dvd's in the users /Applications folder
+    - Fix for 4x3 loose anamorphic to keep it from downscaling
+    - Countless other improvements
+
+    Windows GUI
+    - Resolution calculation
+    - Better preset bar
+    - Better queue (including queue recovery feature)
+    - Better activity log window
+    - Improved UI (layout changes, animated x264 options, DVD drive detection, duration displayed)
+    - More options - includes support for custom auto name format & starting the CLI minimized
+    - Countless other improvements
+
+    Linux GUI (GTK)
+    - It's alive!
+
+    Known Issues in Snapshot 3
+    - Possibility of a flickering line at the top or bottom of the frame after Slow or Slower deinterlacing or decombing
+    - Input bitrate display may be off by a factor of 100 for H.264-in-TS sources
+    - Constant Quality Rate preset probably needs a lower quality level (60% - 55%)
+    - With non-DVD sources that don't have AC3 audio, you can't encode 1 input audio track to multiple output audio tracks
+    - Slow and Slower deinterlacing and decombing are BROKEN in Windows
+    - QuickTime won't read Xvid-in-MP4 output, although VLC will
+    - Windows GUI does not detect all audio tracks from non-DVD sources
 
 0.9.3 Snapshot 1 -> 0.9.3 Snapshot 2 (r1477)
-Core Library:
-- Anamorphic PAR for the AVI container
-- Allow constant frame rates when they different from the source's frame rate (otherwise pass through the variable MPEG-2 frame durations )
-- Decomb filter (selectively deinterlaces when it sees interlacing in the frame)
-- Filter bug fixed, that would skip any filters after detelecine, if VFR wasn't enabled
-- Loose anamorphic + FFmpeg video bug fixed
+    Core Library:
+    - Anamorphic PAR for the AVI container
+    - Allow constant frame rates when they different from the source's frame rate (otherwise pass through the variable MPEG-2 frame durations )
+    - Decomb filter (selectively deinterlaces when it sees interlacing in the frame)
+    - Filter bug fixed, that would skip any filters after detelecine, if VFR wasn't enabled
+    - Loose anamorphic + FFmpeg video bug fixed
 
-Windows GUI:
-- Title dropdown list bug fixed
-- Missing log file bug fixed
+    Windows GUI:
+    - Title dropdown list bug fixed
+    - Missing log file bug fixed
 
-CLI:
-- Default audio samplerate changed to 48kHz, audio bitrate changed to 160kbps.
-- Samplerate entry bug fixed
+    CLI:
+    - Default audio samplerate changed to 48kHz, audio bitrate changed to 160kbps.
+    - Samplerate entry bug fixed
 
 0.9.2 -> 0.9.3 Snapshot 1 (r1457)
-Core Library:
-- New audio subsystem (no more AAC+AC3, control each track's codec and settings individually)
-- Removed libdvdcss (HandBrake no longer decrypts DVDs on its own, will use VLC to do so if it's available)
-- Added Theora encoder
-- Fixed x264-in-avi and ffmpeg-in-avi
-- Fixed xvid
-- More accurate scaling
-- Major sync improvements
-- Major stream improvements
-- AAC+AC3 support in MKV
-- MKV seeking fixes
-- Make sure subtitles get displayed long enough to read them
-- Updated VBV 2-pass and VBV 1-pass patch for x264
-- Adaptive Quantization for x264
-- Recover from bad preview scans
-- Recover from invalid PGNs
-- Fixed vorbis bitrate control
-- Snapshot builds
-
-Mac:
-- New audio interface
-- Loads libdvdcss from VLC at runtime if it's present on the user's system
-- No more general-purpose "Codecs" menu -- set video and audio codecs individually
-- More robust preset system, in preparation for nested presets
-- Made 64-bit MP4 file widget more prominent
-- Only allow useful x264 options in the advanced tab
-- Various fixes and improvements
-
-Windows:
-- New x264 tab
-- New audio interface
-- Various fixes and improvements
-
-CLI:
-- New audio interface
+    Core Library:
+    - New audio subsystem (no more AAC+AC3, control each track's codec and settings individually)
+    - Removed libdvdcss (HandBrake no longer decrypts DVDs on its own, will use VLC to do so if it's available)
+    - Added Theora encoder
+    - Fixed x264-in-avi and ffmpeg-in-avi
+    - Fixed xvid
+    - More accurate scaling
+    - Major sync improvements
+    - Major stream improvements
+    - AAC+AC3 support in MKV
+    - MKV seeking fixes
+    - Make sure subtitles get displayed long enough to read them
+    - Updated VBV 2-pass and VBV 1-pass patch for x264
+    - Adaptive Quantization for x264
+    - Recover from bad preview scans
+    - Recover from invalid PGNs
+    - Fixed vorbis bitrate control
+    - Snapshot builds
+
+    Mac:
+    - New audio interface
+    - Loads libdvdcss from VLC at runtime if it's present on the user's system
+    - No more general-purpose "Codecs" menu -- set video and audio codecs individually
+    - More robust preset system, in preparation for nested presets
+    - Made 64-bit MP4 file widget more prominent
+    - Only allow useful x264 options in the advanced tab
+    - Various fixes and improvements
+
+    Windows:
+    - New x264 tab
+    - New audio interface
+    - Various fixes and improvements
+
+    CLI:
+    - New audio interface
+
+
 
 Changes between 0.9.1 and 0.9.2:
+    CORE
+
+    - AC3 in MP4 support
+    - Multi-track audio support for Apple devices
+    - Better handling of audio discontinuities
+    - More flexible, "loose" anamorphic
+    - Variable frame rate encoding
+    - MP4 optimization for progressive downloads
+    - Dynamic range compression for encoding from AC3 audio
+    - Ability to encode an audio stream and pass it through at the same time
+    - iPhone-compatible anamorphic (pasp atom)
+    - Robust program and transport stream support
+    - Better handling of DVD read errors from invalid VOB units
+    - Detects and works around missing end of cell markers
+    - Recovers from loss of signal in a stream
+    - Drops subtitles less often
+    - Keeps chapter markers in better sync and prevents duplicates
+    - Better handling of B-Frames
+    - Tunes FIFO sizes by CPU count
+    - Finally squashes the bug that cut off the end of movies
+    - Preset changes
+    - Standardizes on standard out for progress and standard error for everything else.
+    - Correct channel counts when passing AC3 audio to Matroska
+    - Tag MP4 files as encoded with HandBrake
+    - No more merging short chapters
+    - Newer copies of x264,
+    - VBV 2-pass patch for x264
+    - Sets keyframes for x264 by frame rate.
+    - Support for >2GB MKV files in Linux
+    - Code audio languages in a way QuickTime understands
+    - Better subtitle positioning
+    - Fewer crashes in 2-pass encoding
+
+    MAC
+
+    - Leopard Only
+    - Sparkle
+    - Reads .eyetv files as well as .dvdmedia files
+    - Much better queue
+    - More white space
+    - Code restructuring
+    - Activity window logging, complete with a "black box recorder" for crashes
+    - Ability to open a single title for a DVD instead of scanning the whole thing
+    - Warns people when they try to queue up two files with the same name
+    - Maintains picture filter states between jobs
+    - .xib Interface Builder files SVN can track
+    - Switches to NSImageView for previews, so no more useless OpenGL effects
+    - Temporary loss of localizations for foreign languages (the old system was broken anyway)
+    - Separate filter settings for every queued job
+
+    WIN
+
+    - Revamped preset system
+    - Sparkle-compatible update checker
+    - Activity log window
+    - CLI built-in preset parsing
+    - No more admin rights required in Vista
+    - Handles more display resolutions
+
+    CLI
+
+    - Built-in presets
+    - Short names for denoising (weak, medium, strong) and deinterlacing (fast, slow, slower) 
+    - Solaris port
+    - No more x264b30 (use -e x264 -I -x level=30:cabac=0 instead or better yet an iPod preset)
+    - Chapter marker .csv input fixed
+    - CRF as default quality mode for x264, now -q is CRF and if you want CQP add -Q to it
+
 
-CORE
-
-- AC3 in MP4 support
-- Multi-track audio support for Apple devices
-- Better handling of audio discontinuities
-- More flexible, "loose" anamorphic
-- Variable frame rate encoding
-- MP4 optimization for progressive downloads
-- Dynamic range compression for encoding from AC3 audio
-- Ability to encode an audio stream and pass it through at the same time
-- iPhone-compatible anamorphic (pasp atom)
-- Robust program and transport stream support
-- Better handling of DVD read errors from invalid VOB units
-- Detects and works around missing end of cell markers
-- Recovers from loss of signal in a stream
-- Drops subtitles less often
-- Keeps chapter markers in better sync and prevents duplicates
-- Better handling of B-Frames
-- Tunes FIFO sizes by CPU count
-- Finally squashes the bug that cut off the end of movies
-- Preset changes
-- Standardizes on standard out for progress and standard error for everything else.
-- Correct channel counts when passing AC3 audio to Matroska
-- Tag MP4 files as encoded with HandBrake
-- No more merging short chapters
-- Newer copies of x264,
-- VBV 2-pass patch for x264
-- Sets keyframes for x264 by frame rate.
-- Support for >2GB MKV files in Linux
-- Code audio languages in a way QuickTime understands
-- Better subtitle positioning
-- Fewer crashes in 2-pass encoding
-
-MAC
-
-- Leopard Only
-- Sparkle
-- Reads .eyetv files as well as .dvdmedia files
-- Much better queue
-- More white space
-- Code restructuring
-- Activity window logging, complete with a "black box recorder" for crashes
-- Ability to open a single title for a DVD instead of scanning the whole thing
-- Warns people when they try to queue up two files with the same name
-- Maintains picture filter states between jobs
-- .xib Interface Builder files SVN can track
-- Switches to NSImageView for previews, so no more useless OpenGL effects
-- Temporary loss of localizations for foreign languages (the old system was broken anyway)
-- Separate filter settings for every queued job
-
-WIN
-
-- Revamped preset system
-- Sparkle-compatible update checker
-- Activity log window
-- CLI built-in preset parsing
-- No more admin rights required in Vista
-- Handles more display resolutions
-
-CLI
-
-- Built-in presets
-- Short names for denoising (weak, medium, strong) and deinterlacing (fast, slow, slower) 
-- Solaris port
-- No more x264b30 (use -e x264 -I -x level=30:cabac=0 instead or better yet an iPod preset)
-- Chapter marker .csv input fixed
-- CRF as default quality mode for x264, now -q is CRF and if you want CQP add -Q to it
 
 Changes between 0.9.0 and 0.9.1:
 
@@ -694,7 +753,9 @@ Changes between 0.9.0 and 0.9.1:
 	+ Fixed: Add-to-queue issues
 	+ Fixed: Foreign language issues
 	Assorted other changes
-	
+
+
+
 Changes between 0.8.5b1 and 0.9.0:
 
 	Core HandBrake Changes
@@ -739,6 +800,8 @@ Changes between 0.8.5b1 and 0.9.0:
 	+ Changed: DVD information parser
 	Assorted other changes
 
+
+
 Changes between 0.8.0b1 and 0.8.5b1
 
 	Core HandBrake Changes
@@ -818,6 +881,7 @@ Changes between 0.8.0b1 and 0.8.5b1
 	+ Removed: The Help and Support window. Been replaced with a few Web Links.
 
 
+    
 Changes between 0.7.1 and 0.8.0
  + MediaFork project forked from HandBrake source <http://handbrake.m0k.org/>
  + Updated libraries (meaning better quality, hopefully fewer bugs, and increased speeds)
@@ -833,10 +897,14 @@ Changes between 0.7.1 and 0.8.0
  + New preference item to select the default audio language (Mac OS X)
  + Bugfix for reading straight from a DVD
 
+ 
+ 
 Changes between 0.7.0 and 0.7.1
  + Universal Binary for PPC and Intel
  + Bugfixes for missing subtitles, audio glitches with LPCM tracks and more
 
+ 
+ 
 Changes between 0.7.0-beta3 and 0.7.0
  + Multithreaded H.264 encoding with x264
  + Added option for H.264 Baseline (suitable for iPods)
@@ -844,6 +912,8 @@ Changes between 0.7.0-beta3 and 0.7.0
  + Fixes for some DVD titles HandBrake would not recognize
  + Fixes audio gliches when encoding from LPCM tracks
 
+ 
+ 
 Changes between 0.6.2 and 0.7.0-beta3
  + Chapters selection
  + Custom framerate
@@ -860,6 +930,8 @@ Changes between 0.6.2 and 0.7.0-beta3
  + Grayscale encoding
  + Up-to-date BeOS UI
 
+ 
+ 
 Changes between 0.6.1 and 0.6.2
  + Support for DVDs with MPEG audio tracks
  + Rewrote the DVD navigation code
@@ -869,9 +941,13 @@ Changes between 0.6.1 and 0.6.2
  + Internal improvements
  + Bugfixes
 
+ 
+ 
 Changes between 0.6.0 and 0.6.1
  + Fixed LPCM endianness issue
 
+ 
+ 
 Changes between 0.5.2 and 0.6.0
  + MP4 and OGM output
  + AAC and Vorbis encoding
@@ -881,37 +957,53 @@ Changes between 0.5.2 and 0.6.0
  + GTK2 linux interface
  + OS X interface localization
 
+ 
+ 
 Changes between 0.5.1 and 0.5.2
  + Bugfixes
 
+ 
+ 
 Changes between 0.5 and 0.5.1
  + 2-pass XviD encoding
  + Bugfixes
 
+ 
+ 
 Changes between 0.4 and 0.5
  + Bugfixes, rewrite of large parts of the core
  + XviD encoding (1-pass only)
 
+ 
+ 
 Changes between 0.3 and 0.4
  + Better multithreading
  + Allow the user to specify a target size instead of bitrate
  + Misc GUI enhancements
  + Use low-priority threads on OS X
 
+ 
+ 
 Changes between 0.2 and 0.3
  + OSX & Linux ports
  + Allow 2-pass encoding
  + Many internal changes & fixes
 
+ 
+ 
 Changes between 0.1.1 and 0.2
  + Fixed a major bug that made HandBrake probably crash after ~ 15
    minutes encoded
  + Fixed a few minor memory leaks
 
+ 
+ 
 Changes between 0.1 and 0.1.1
  + Fixed a stupid bug that prevented to scan volumes correctly if
    FAT/NTFS/etc volumes were mounted
 
+   
+   
 Changes between 0.1-alpha2 and 0.1 :
  + Automatically detect ripped DVDs on BFS volumes
  + Allow picture cropping and resizing
@@ -920,9 +1012,13 @@ Changes between 0.1-alpha2 and 0.1 :
    and BSPlayer)
  + Better A/V sync with some DVDs
 
+ 
+ 
 Changes between 0.1-alpha and 0.1-alpha2 :
  + Show length for each title
  + Fixed the screwed-audio bug
  + Many bugfixes...
 
+ 
+ 
 First version is 0.1-alpha.
diff --git a/win/CS/doc/THANKS b/win/CS/doc/THANKS
index c703100d6..ca228204e 100644
--- a/win/CS/doc/THANKS
+++ b/win/CS/doc/THANKS
@@ -5,7 +5,6 @@ Graphics:
 Modernised Application Icon by Matt Johnson (mattdog.100@gmail.com)
 
 Handbrake Toolbar Icons by Nik Pawlak  (holla@nikpawlak.com, @nikpawlak, http://nikpawlak.com)
-  For use only with Handbrake software and directly related non commercial projects.
 
 
 Hosting:
@@ -19,7 +18,6 @@ Software:
 
 ReviewBoard (http://www.reviewboard.org/)
 PhpBB (http://www.phpbb.com/)
-hlscript (http://badmofo.org/hlscript/)
 Jetbrains ReSharper (http://www.jetbrains.com/resharper/features/index.html?linklogos)
 VisualSVN (http://www.visualsvn.com)
 
-- 
2.49.0