Request 2508 (accepted)

handbrake.changes Changed

handbrake.spec Changed

@@ -18,11 +18,11 @@
 
 Name:           handbrake
 Summary:        Multithreaded Video Transcoder
-Version:        0.10.2
+Version:        0.10.5
 Release:        1
 Url:            http://handbrake.fr/
 Source0:        HandBrake-%{version}.tar.bz2
-Patch0:         HandBrake-0.10.0-no-builddate.patch
+Patch0:         HandBrake-no-builddate.patch
 Patch1:         HandBrake-build-shared.patch
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -36,7 +36,7 @@
 BuildRequires:  libtool
 BuildRequires:  make
 BuildRequires:  nasm
-BuildRequires:  python
+BuildRequires:  python > 2.7.3
 BuildRequires:  subversion
 BuildRequires:  update-desktop-files
 BuildRequires:  wget
@@ -61,11 +61,11 @@
 %endif
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec)
-BuildRequires:  pkgconfig(libavformat)
-BuildRequires:  pkgconfig(libavresample)
-BuildRequires:  pkgconfig(libavutil)
-BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libavcodec) >= 57
+BuildRequires:  pkgconfig(libavformat) >= 57
+BuildRequires:  pkgconfig(libavresample) >= 3
+BuildRequires:  pkgconfig(libavutil) >= 55
+BuildRequires:  pkgconfig(libswscale) >= 4
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(samplerate)
@@ -111,7 +111,7 @@
 
 %prep
 %setup -q -n HandBrake-%{version}
-%patch0 -p1
+%patch0 -p0
 %patch1 -p0
 
 %build

HandBrake-0.10.0-no-builddate.patch Deleted

@@ -1,45 +0,0 @@
-Index: b/make/configure.py
-===================================================================
---- a/make/configure.py
-+++ b/make/configure.py
-@@ -807,19 +807,19 @@ class Project( Action ):
-             self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint)
-             url_ctype = ''
-             url_ntype = 'stable'
--            self.build = time.strftime('%Y%m%d') + '00'
-+            self.build = '@BUILD@' + '00'
-             self.title = '%s %s (%s)' % (self.name,self.version,self.build)
-         elif repo.type == 'developer':
-             self.version = '%dsvn' % (repo.rev)
-             url_ctype = '_unstable'
-             url_ntype = 'unstable'
--            self.build = time.strftime('%Y%m%d') + '01'
-+            self.build = '@BUILD@' + '01'
-             self.title = '%s svn%d (%s)' % (self.name,repo.rev,self.build)
-         else:
-             self.version = 'rev%d' % (repo.rev)
-             url_ctype = '_unofficial'
-             url_ntype = 'unofficial'
--            self.build = time.strftime('%Y%m%d') + '99'
-+            self.build = '@BUILD@' + '99'
-             self.title = '%s rev%d (%s)' % (self.name,repo.rev,self.build)
- 
-         self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
-@@ -1621,7 +1621,7 @@ int main()
- 
-     ## create document object
-     doc = ConfigDocument()
--    doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
-+    # doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
- 
-     ## add configure line for reconfigure purposes
-     doc.addBlank()
-@@ -1690,7 +1690,7 @@ int main()
-     else:
-         doc.add( 'BUILD.cross.prefix', '' )
- 
--    doc.add( 'BUILD.date',   time.strftime('%c') )
-+    # doc.add( 'BUILD.date',   time.strftime('%c') )
-     doc.add( 'BUILD.arch',   arch.mode.mode )
- 
-     doc.addBlank()

HandBrake-build-shared.patch Changed

@@ -1,5 +1,5 @@
---- gtk/configure.ac.orig	2016-01-09 12:16:52.898315042 +0100
-+++ gtk/configure.ac	2016-01-09 12:16:52.918314661 +0100
+--- gtk/configure.ac.orig	2016-01-23 22:14:17.840780524 +0100
++++ gtk/configure.ac	2016-01-23 22:14:17.848780387 +0100
 @@ -158,7 +158,7 @@
  GHB_TOOLS_CFLAGS=`$BUILD_PKG_CONFIG --cflags glib-2.0 gdk-pixbuf-2.0`
  GHB_TOOLS_LIBS=`$BUILD_PKG_CONFIG --libs glib-2.0 gdk-pixbuf-2.0`
@@ -9,8 +9,8 @@
  
  case $host in
    *-*-mingw*)
---- make/include/main.defs.orig	2016-01-09 12:16:56.814240398 +0100
-+++ make/include/main.defs	2016-01-09 14:51:54.590379620 +0100
+--- make/include/main.defs.orig	2016-01-23 22:14:21.448718455 +0100
++++ make/include/main.defs	2016-01-23 22:14:21.460718248 +0100
 @@ -51,22 +51,18 @@
      MODULES += contrib/libsamplerate
      MODULES += contrib/lame
@@ -40,12 +40,12 @@
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
      MODULES += contrib/pthreadw32
---- test/module.defs.orig	2016-01-09 12:17:01.246155850 +0100
-+++ test/module.defs	2016-01-09 12:17:01.258155621 +0100
+--- test/module.defs.orig	2016-01-23 22:14:25.400650464 +0100
++++ test/module.defs	2016-01-23 22:14:25.408650327 +0100
 @@ -16,7 +16,7 @@
  TEST.GCC.l = \
-         ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig fribidi mp3lame ogg \
+         ass avresample avformat avcodec avutil mp3lame dvdnav dvdread \
+         fontconfig fribidi ogg \
 -        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
 +        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
          bluray freetype xml2 bz2 z

HandBrake-no-builddate.patch Added

@@ -0,0 +1,38 @@
+--- make/configure.py.orig	2016-01-23 22:22:40.236132735 +0100
++++ make/configure.py	2016-01-23 22:22:40.284131911 +0100
+@@ -841,7 +841,7 @@
+ 
+             url_ctype = '_unstable'
+             url_ntype = 'unstable'
+-            self.build = time.strftime('%Y%m%d') + '01'
++            self.build = '@BUILD@' + '01'
+             self.title = '%s %s (%s)' % (self.name,self.version,self.build)
+         else:
+             m = re.match('^([a-zA-Z]+)\.([0-9]+)$', suffix)
+@@ -860,7 +860,7 @@
+                 url_ctype = '_unstable'
+                 url_ntype = 'unstable'
+ 
+-            self.build = time.strftime('%Y%m%d') + '00'
++            self.build = '@BUILD@' + '00'
+             self.title = '%s %s (%s)' % (self.name,self.version,self.build)
+ 
+         self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
+@@ -1669,7 +1669,7 @@
+ 
+     ## create document object
+     doc = ConfigDocument()
+-    doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
++    # doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
+ 
+     ## add configure line for reconfigure purposes
+     doc.addBlank()
+@@ -1742,7 +1742,7 @@
+     else:
+         doc.add( 'BUILD.cross.prefix', '' )
+ 
+-    doc.add( 'BUILD.date',   time.strftime('%c') )
++    # doc.add( 'BUILD.date',   time.strftime('%c') )
+     doc.add( 'BUILD.arch',   arch.mode.mode )
+ 
+     doc.addBlank()

HandBrake-0.10.2.tar.bz2/contrib/x265/A00-maxCUSize-idiocy.patch Deleted

HandBrake-0.10.2.tar.bz2/contrib/x265/A01-cudata-init.patch Deleted

HandBrake-0.10.2.tar.bz2/libhb/enclame.c Deleted

@@ -1,236 +0,0 @@
-/* enclame.c
-
- Copyright (c) 2003-2015 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-#include "hb.h"
-
-#include "lame/lame.h"
-
-int enclameInit( hb_work_object_t *, hb_job_t * );
-int enclameWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-void enclameClose( hb_work_object_t * );
-
-hb_work_object_t hb_enclame =
-{
- WORK_ENCLAME,
- "MP3 encoder (libmp3lame)",
- enclameInit,
- enclameWork,
- enclameClose
-};
-
-struct hb_work_private_s
-{
- hb_job_t * job;
-
- /* LAME handle */
- lame_global_flags * lame;
-
- int out_discrete_channels;
- unsigned long input_samples;
- unsigned long output_bytes;
- uint8_t * buf;
-
- hb_list_t * list;
- int64_t pts;
-};
-
-int enclameInit( hb_work_object_t * w, hb_job_t * job )
-{
- hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
- hb_audio_t * audio = w->audio;
-
- w->private_data = pv;
-
- pv->job = job;
-
- hb_log( "enclame: opening libmp3lame" );
-
- pv->lame = lame_init();
- // use ABR
- lame_set_scale( pv->lame, 32768.0 );
- if( audio->config.out.compression_level >= 0 )
- {
- lame_set_quality( pv->lame, audio->config.out.compression_level );
- }
- if( audio->config.out.bitrate > 0 )
- {
- lame_set_VBR( pv->lame, vbr_abr );
- lame_set_VBR_mean_bitrate_kbps( pv->lame, audio->config.out.bitrate );
- }
- else if( audio->config.out.quality >= 0 )
- {
- lame_set_brate( pv->lame, 0 );
- lame_set_VBR( pv->lame, vbr_default );
- lame_set_VBR_quality( pv->lame, audio->config.out.quality );
- }
- lame_set_in_samplerate( pv->lame, audio->config.out.samplerate );
- lame_set_out_samplerate( pv->lame, audio->config.out.samplerate );
-
- pv->out_discrete_channels = hb_mixdown_get_discrete_channel_count( audio->config.out.mixdown );
- // Lame's default encoding mode is JOINT_STEREO. This subtracts signal
- // that is "common" to left and right (within some threshold) and encodes
- // it separately. This improves quality at low bitrates, but hurts 
- // imaging (channel separation) at higher bitrates. So if the bitrate
- // is suffeciently high, use regular STEREO mode.
- if ( pv->out_discrete_channels == 1 )
- {
- lame_set_mode( pv->lame, MONO );
- lame_set_num_channels( pv->lame, 1 );
- }
- else if ( audio->config.out.bitrate >= 128 )
- {
- lame_set_mode( pv->lame, STEREO );
- }
- lame_init_params( pv->lame );
-
- pv->input_samples = 1152 * pv->out_discrete_channels;
- pv->output_bytes = LAME_MAXMP3BUFFER;
- pv->buf = malloc( pv->input_samples * sizeof( float ) );
- audio->config.out.samples_per_frame = 1152;
-
- pv->list = hb_list_init();
- pv->pts = AV_NOPTS_VALUE;
-
- return 0;
-}
-
-/***********************************************************************
- * Close
- ***********************************************************************
- *
- **********************************************************************/
-void enclameClose( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
-
- lame_close( pv->lame );
- hb_list_empty( &pv->list );
- free( pv->buf );
- free( pv );
- w->private_data = NULL;
-}
-
-/***********************************************************************
- * Encode
- ***********************************************************************
- *
- **********************************************************************/
-static hb_buffer_t * Encode( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
- hb_audio_t * audio = w->audio;
- hb_buffer_t * buf;
- float samples[2][1152];
- uint64_t pts, pos;
- int i, j;
-
- if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
- {
- return NULL;
- }
-
- hb_list_getbytes( pv->list, pv->buf, pv->input_samples * sizeof( float ),
- &pts, &pos);
-
- for( i = 0; i < 1152; i++ )
- {
- for( j = 0; j < pv->out_discrete_channels; j++ )
- {
- samples[j][i] = ((float *) pv->buf)[(pv->out_discrete_channels * i + j)];
- }
- }
-
- buf = hb_buffer_init( pv->output_bytes );
- buf->s.start = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
- buf->s.duration = (double)90000 * 1152 / audio->config.out.samplerate;
- buf->s.stop = buf->s.start + buf->s.duration;
- pv->pts = buf->s.stop;
- buf->size = lame_encode_buffer_float( 
- pv->lame, samples[0], samples[1],
- 1152, buf->data, LAME_MAXMP3BUFFER );
-
- buf->s.type = AUDIO_BUF;
- buf->s.frametype = HB_FRAME_AUDIO;
-
- if( !buf->size )
- {
- /* Encoding was successful but we got no data. Try to encode
- more */
- hb_buffer_close( &buf );
- return Encode( w );
- }
- else if( buf->size < 0 )
- {
- hb_log( "enclame: lame_encode_buffer failed" );
- hb_buffer_close( &buf );
- return NULL;
- }
- return buf;
-}
-
-/***********************************************************************
- * Work
- ***********************************************************************
- *
- **********************************************************************/
-int enclameWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_audio_t * audio = w->audio;
- hb_buffer_t * in = *buf_in;
- hb_buffer_t * buf;
-
- if ( (*buf_in)->size <= 0 )
- {
- /* EOF on input - send it downstream & say we're done */
-
- buf = hb_buffer_init( pv->output_bytes );
- buf->size = lame_encode_flush( pv->lame, buf->data, LAME_MAXMP3BUFFER );
- buf->s.start = pv->pts;
- buf->s.stop = buf->s.start + 90000 * 1152 / audio->config.out.samplerate;
-
- buf->s.type = AUDIO_BUF;
- buf->s.frametype = HB_FRAME_AUDIO;
-
- if( buf->size <= 0 )
- {
- hb_buffer_close( &buf );
- }
-
- // Add the flushed data
- *buf_out = buf;
-
- // Add the eof
- if ( buf )
- {
- buf->next = in;
- }
- else
- {
- *buf_out = in;
- }
-
- *buf_in = NULL;
- return HB_WORK_DONE;
- }
-
- hb_list_add( pv->list, *buf_in );
- *buf_in = NULL;
-
- *buf_out = buf = Encode( w );
-
- while( buf )
- {
- buf->next = Encode( w );
- buf = buf->next;
- }
-
- return HB_WORK_OK;
-}
-

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.Nightly.tmpl Deleted

@@ -1,42 +0,0 @@
-/* AssemblyInfo.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake")]
-[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2014 HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.$WCREV$")]
-[assembly: NeutralResourcesLanguage("")]

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs.tmpl Deleted

@@ -1,42 +0,0 @@
-/* AssemblyInfo.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake")]
-[assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2014 HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5e4e3f97-5252-41f6-aae9-3846f62cbc66")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.10.2.$WCREV$")]
-[assembly: NeutralResourcesLanguage("")]

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl Deleted

@@ -1,326 +0,0 @@
-/* Resources.Designer.cs $
-
- 	 This file is part of the HandBrake source code.
- 	 Homepage: <http://handbrake.fr/>.
- 	 It may be used under the terms of the GNU General Public License. */
-
-; Script generated by the HM NIS Edit Script Wizard.
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "Handbrake"
-!define PRODUCT_VERSION "$WCREV$ Nightly"
-!define PRODUCT_VERSION_NUMBER "svn$WCREV$"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-;Required .NET framework
-!define MIN_FRA_MAJOR "4"
-!define MIN_FRA_MINOR "0"
-!define MIN_FRA_BUILD "*"
-
-SetCompressor lzma
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "handbrakepineapple.ico"
-!define MUI_UNICON "handbrakepineapple.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe"
-
-!include WordFunc.nsh
-!insertmacro VersionCompare
-!include LogicLib.nsh
-
-InstallDir "$PROGRAMFILES\Handbrake"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Var InstallDotNET
-
-Function .onInit
-
- ; Begin Only allow one version
- System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
- Pop $R0
-
- StrCmp $R0 0 +3
- MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
- Abort
-
- ;Remove previous version
- ReadRegStr $R0 HKLM \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
- "UninstallString"
- StrCmp $R0 "" done
-
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
- previous version or `Cancel` to continue." /SD IDOK \
- IDOK uninst
- goto done
-
- ;Run the uninstaller
- uninst:
- IfSilent +3
- Exec $INSTDIR\uninst.exe
- goto done
- Exec '"$INSTDIR\uninst.exe" /S'
- done:
-FunctionEnd
-
-Section "Handbrake" SEC01
- SetOutPath "$INSTDIR"
- SetOverwrite ifnewer
-
- ; Begin Check .NET version
- StrCpy $InstallDotNET "No"
- Call CheckFramework
- StrCmp $0 "1" +3
- StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
- Pop $0
-
- ; Get .NET if required
- ${If} $InstallDotNET == "Yes"
- SetDetailsView hide
- inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
- Pop $1
-
- ${If} $1 != "OK"
- Delete "$INSTDIR\dotnetfx.exe"
- Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
- ${EndIf}
-
- ExecWait "$INSTDIR\dotnetfx.exe"
- Delete "$INSTDIR\dotnetfx.exe"
-
- SetDetailsView show
- ${EndIf}
- 
- ; Install Files
- File "*.exe"
- CreateDirectory "$SMPROGRAMS\Handbrake"
- CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
- CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
- File "*.dll"
- File "*.config"
- File "*.xml"
- File "*.pdb"
-
- ; Copy the standard doc set into the doc folder
- SetOutPath "$INSTDIR\doc"
- SetOverwrite ifnewer
- File "doc\*.*"
-
- ; Copy the standard fonts config set into the fonts folder
- SetOutPath "$INSTDIR\fonts"
- SetOverwrite ifnewer
- File /r "fonts\*.*"
-SectionEnd
-
-Section -AdditionalIcons
- CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
- WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-SectionEnd
-
-
-Function un.onUninstSuccess
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
-FunctionEnd
-
-Function un.onInit
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
- Abort
-FunctionEnd
-
-Section Uninstall
- Delete "$INSTDIR\uninst.exe"
- 
- Delete "$INSTDIR\*.*"
- Delete "$INSTDIR\doc\*.*"
- Delete "$INSTDIR\fonts\*.*"
- Delete "$INSTDIR\fonts\conf.d\*.*"
- Delete "$INSTDIR\fonts\conf.avail\*.*"
- RMDir "$INSTDIR\doc"
- RMDIR "$INSTDIR\fonts\conf.d"
- RMDIR "$INSTDIR\fonts\conf.avail"
- RMDIR "$INSTDIR\fonts"
- Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
- Delete "$DESKTOP\Handbrake.lnk"
- Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
- RMDir "$SMPROGRAMS\Handbrake"
- RMDir "$INSTDIR"
-
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
- DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
- SetAutoClose true
-SectionEnd
-
-;Check for .NET framework
-Function CheckFrameWork
-
- ;Save the variables in case something else is using them
- Push $0
- Push $1
- Push $2
- Push $3
- Push $4
- Push $R1
- Push $R2
- Push $R3
- Push $R4
- Push $R5
- Push $R6
- Push $R7
- Push $R8
-
- StrCpy $R5 "0"
- StrCpy $R6 "0"
- StrCpy $R7 "0"
- StrCpy $R8 "0.0.0"
- StrCpy $0 0
-
- loop:
-
- ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
- EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
- StrCmp $1 "" done ;jump to end if no more registry keys
- IntOp $0 $0 + 1
- StrCpy $2 $1 1 ;Cut off the first character
- StrCpy $3 $1 "" 1 ;Remainder of string
-
- ;Loop if first character is not a 'v'
- StrCmpS $2 "v" start_parse loop
-
- ;Parse the string
- start_parse:
- StrCpy $R1 ""
- StrCpy $R2 ""
- StrCpy $R3 ""
- StrCpy $R4 $3
-
- StrCpy $4 1
-
- parse:
- StrCmp $3 "" parse_done ;If string is empty, we are finished
- StrCpy $2 $3 1 ;Cut off the first character
- StrCpy $3 $3 "" 1 ;Remainder of string
- StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
-
- is_dot:
- IntOp $4 $4 + 1 ; Move to the next section
- goto parse ;Carry on parsing
-
- not_dot:
- IntCmp $4 1 major_ver
- IntCmp $4 2 minor_ver
- IntCmp $4 3 build_ver
- IntCmp $4 4 parse_done
-
- major_ver:
- StrCpy $R1 $R1$2
- goto parse ;Carry on parsing
-
- minor_ver:
- StrCpy $R2 $R2$2
- goto parse ;Carry on parsing
-
- build_ver:
- StrCpy $R3 $R3$2
- goto parse ;Carry on parsing
-
- parse_done:
-
- IntCmp $R1 $R5 this_major_same loop this_major_more
- this_major_more:
- StrCpy $R5 $R1
- StrCpy $R6 $R2
- StrCpy $R7 $R3
- StrCpy $R8 $R4
-
- goto loop
-
- this_major_same:
- IntCmp $R2 $R6 this_minor_same loop this_minor_more
- this_minor_more:
- StrCpy $R6 $R2
- StrCpy $R7 R3
- StrCpy $R8 $R4
- goto loop
-
- this_minor_same:
- IntCmp $R3 $R7 loop loop this_build_more
- this_build_more:
- StrCpy $R7 $R3
- StrCpy $R8 $R4
- goto loop
-
- done:
-
- ;Have we got the framework we need?
- IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
- max_major_same:
- IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
- max_minor_same:
- IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
-
- ;Version on machine is greater than what we need
- OK:
- StrCpy $0 "1"
- goto end
-
- fail:
- StrCmp $R8 "0.0.0" end
-
-
- end:
-
- ;Pop the variables we pushed earlier
- Pop $R8
- Pop $R7
- Pop $R6
- Pop $R5
- Pop $R4
- Pop $R3
- Pop $R2
- Pop $R1
- Pop $4
- Pop $3
- Pop $2
- Pop $1
-FunctionEnd
\ No newline at end of file

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl Deleted

@@ -1,326 +0,0 @@
-/* Resources.Designer.cs $
-
- 	 This file is part of the HandBrake source code.
- 	 Homepage: <http://handbrake.fr/>.
- 	 It may be used under the terms of the GNU General Public License. */
-
-; Script generated by the HM NIS Edit Script Wizard.
-
-; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "Handbrake"
-!define PRODUCT_VERSION "$WCREV$ Nightly"
-!define PRODUCT_VERSION_NUMBER "svn$WCREV$"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-;Required .NET framework
-!define MIN_FRA_MAJOR "4"
-!define MIN_FRA_MINOR "0"
-!define MIN_FRA_BUILD "*"
-
-SetCompressor lzma
-
-; MUI 1.67 compatible ------
-!include "MUI.nsh"
-
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_ICON "handbrakepineapple.ico"
-!define MUI_UNICON "handbrakepineapple.ico"
-
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; License page
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
-; MUI end ------
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_x86_64-Win_GUI.exe"
-
-!include WordFunc.nsh
-!insertmacro VersionCompare
-!include LogicLib.nsh
-
-InstallDir "$PROGRAMFILES64\Handbrake"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-Var InstallDotNET
-
-Function .onInit
-
- ; Begin Only allow one version
- System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
- Pop $R0
-
- StrCmp $R0 0 +3
- MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
- Abort
-
- ;Remove previous version
- ReadRegStr $R0 HKLM \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
- "UninstallString"
- StrCmp $R0 "" done
-
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
- previous version or `Cancel` to continue." /SD IDOK \
- IDOK uninst
- goto done
-
- ;Run the uninstaller
- uninst:
- IfSilent +3
- Exec $INSTDIR\uninst.exe
- goto done
- Exec '"$INSTDIR\uninst.exe" /S'
- done:
-FunctionEnd
-
-Section "Handbrake" SEC01
- SetOutPath "$INSTDIR"
- SetOverwrite ifnewer
-
- ; Begin Check .NET version
- StrCpy $InstallDotNET "No"
- Call CheckFramework
- StrCmp $0 "1" +3
- StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
- Pop $0
-
- ; Get .NET if required
- ${If} $InstallDotNET == "Yes"
- SetDetailsView hide
- inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
- Pop $1
-
- ${If} $1 != "OK"
- Delete "$INSTDIR\dotnetfx.exe"
- Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
- ${EndIf}
-
- ExecWait "$INSTDIR\dotnetfx.exe"
- Delete "$INSTDIR\dotnetfx.exe"
-
- SetDetailsView show
- ${EndIf}
- 
- ; Install Files
- File "*.exe"
- CreateDirectory "$SMPROGRAMS\Handbrake"
- CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
- CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
- File "*.dll"
- File "*.config"
- File "*.xml"
- File "*.pdb"
-
- ; Copy the standard doc set into the doc folder
- SetOutPath "$INSTDIR\doc"
- SetOverwrite ifnewer
- File "doc\*.*"
-
- ; Copy the standard fonts config set into the fonts folder
- SetOutPath "$INSTDIR\fonts"
- SetOverwrite ifnewer
- File /r "fonts\*.*"
-SectionEnd
-
-Section -AdditionalIcons
- CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
-SectionEnd
-
-Section -Post
- WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-SectionEnd
-
-
-Function un.onUninstSuccess
- HideWindow
- MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
-FunctionEnd
-
-Function un.onInit
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
- Abort
-FunctionEnd
-
-Section Uninstall
- Delete "$INSTDIR\uninst.exe"
- 
- Delete "$INSTDIR\*.*"
- Delete "$INSTDIR\doc\*.*"
- Delete "$INSTDIR\fonts\*.*"
- Delete "$INSTDIR\fonts\conf.d\*.*"
- Delete "$INSTDIR\fonts\conf.avail\*.*"
- RMDir "$INSTDIR\doc"
- RMDIR "$INSTDIR\fonts\conf.d"
- RMDIR "$INSTDIR\fonts\conf.avail"
- RMDIR "$INSTDIR\fonts"
- Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
- Delete "$DESKTOP\Handbrake.lnk"
- Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
- RMDir "$SMPROGRAMS\Handbrake"
- RMDir "$INSTDIR"
-
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
- DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
- SetAutoClose true
-SectionEnd
-
-;Check for .NET framework
-Function CheckFrameWork
-
- ;Save the variables in case something else is using them
- Push $0
- Push $1
- Push $2
- Push $3
- Push $4
- Push $R1
- Push $R2
- Push $R3
- Push $R4
- Push $R5
- Push $R6
- Push $R7
- Push $R8
-
- StrCpy $R5 "0"
- StrCpy $R6 "0"
- StrCpy $R7 "0"
- StrCpy $R8 "0.0.0"
- StrCpy $0 0
-
- loop:
-
- ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
- EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
- StrCmp $1 "" done ;jump to end if no more registry keys
- IntOp $0 $0 + 1
- StrCpy $2 $1 1 ;Cut off the first character
- StrCpy $3 $1 "" 1 ;Remainder of string
-
- ;Loop if first character is not a 'v'
- StrCmpS $2 "v" start_parse loop
-
- ;Parse the string
- start_parse:
- StrCpy $R1 ""
- StrCpy $R2 ""
- StrCpy $R3 ""
- StrCpy $R4 $3
-
- StrCpy $4 1
-
- parse:
- StrCmp $3 "" parse_done ;If string is empty, we are finished
- StrCpy $2 $3 1 ;Cut off the first character
- StrCpy $3 $3 "" 1 ;Remainder of string
- StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
-
- is_dot:
- IntOp $4 $4 + 1 ; Move to the next section
- goto parse ;Carry on parsing
-
- not_dot:
- IntCmp $4 1 major_ver
- IntCmp $4 2 minor_ver
- IntCmp $4 3 build_ver
- IntCmp $4 4 parse_done
-
- major_ver:
- StrCpy $R1 $R1$2
- goto parse ;Carry on parsing
-
- minor_ver:
- StrCpy $R2 $R2$2
- goto parse ;Carry on parsing
-
- build_ver:
- StrCpy $R3 $R3$2
- goto parse ;Carry on parsing
-
- parse_done:
-
- IntCmp $R1 $R5 this_major_same loop this_major_more
- this_major_more:
- StrCpy $R5 $R1
- StrCpy $R6 $R2
- StrCpy $R7 $R3
- StrCpy $R8 $R4
-
- goto loop
-
- this_major_same:
- IntCmp $R2 $R6 this_minor_same loop this_minor_more
- this_minor_more:
- StrCpy $R6 $R2
- StrCpy $R7 R3
- StrCpy $R8 $R4
- goto loop
-
- this_minor_same:
- IntCmp $R3 $R7 loop loop this_build_more
- this_build_more:
- StrCpy $R7 $R3
- StrCpy $R8 $R4
- goto loop
-
- done:
-
- ;Have we got the framework we need?
- IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
- max_major_same:
- IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
- max_minor_same:
- IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
-
- ;Version on machine is greater than what we need
- OK:
- StrCpy $0 "1"
- goto end
-
- fail:
- StrCmp $R8 "0.0.0" end
-
-
- end:
-
- ;Pop the variables we pushed earlier
- Pop $R8
- Pop $R7
- Pop $R6
- Pop $R5
- Pop $R4
- Pop $R3
- Pop $R2
- Pop $R1
- Pop $4
- Pop $3
- Pop $2
- Pop $1
-FunctionEnd
\ No newline at end of file

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl Deleted

@@ -1,65 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake")]
-[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2003-2015 HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>. For example, if you are using US english
-//in your source files, set the <UICulture> to en-US. Then uncomment
-//the NeutralResourceLanguage attribute below. Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
- //(used if a resource is not found in the page, 
- // or application resource dictionaries)
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
- //(used if a resource is not found in the page, 
- // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.$WCREV$")]
-[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl Deleted

@@ -1,65 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake")]
-[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video transcoder.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake")]
-[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2003-2015 HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>. For example, if you are using US english
-//in your source files, set the <UICulture> to en-US. Then uncomment
-//the NeutralResourceLanguage attribute below. Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
- //(used if a resource is not found in the page, 
- // or application resource dictionaries)
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
- //(used if a resource is not found in the page, 
- // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.10.2.$WCREV$")]
-[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

HandBrake-0.10.5.tar.bz2/.gitignore Added

HandBrake-0.10.2.tar.bz2/NEWS -> HandBrake-0.10.5.tar.bz2/NEWS Changed

HandBrake-0.10.2.tar.bz2/contrib/cmake/module.defs -> HandBrake-0.10.5.tar.bz2/contrib/cmake/module.defs Changed

HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/A06-matroskaenc-track-lang.patch Added

HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/A12-avi-dv.patch Added

@@ -0,0 +1,37 @@
+commit 0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4
+Author: Michael Niedermayer <michaelni@gmx.at>
+Date: Sat Nov 28 21:06:45 2015 +0100
+
+ avi: Validate the stream-id for DV as well
+ 
+ Avoid false positives while syncing.
+ 
+ Bug-Id: ffmpeg/4086
+ Bug-Id: 879
+ 
+ Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+ Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
+
+diff --git a/libavformat/avidec.c b/libavformat/avidec.c
+index 43c178f..477e045 100644
+--- a/libavformat/avidec.c
++++ b/libavformat/avidec.c
+@@ -995,7 +995,7 @@ start_sync:
+ goto start_sync;
+ }
+ 
+- n = avi->dv_demux ? 0 : get_stream_idx(d);
++ n = get_stream_idx(d);
+ 
+ if (!((i - avi->last_pkt_pos) & 1) &&
+ get_stream_idx(d + 1) < s->nb_streams)
+@@ -1007,6 +1007,9 @@ start_sync:
+ goto start_sync;
+ }
+ 
++ if (avi->dv_demux && n != 0)
++ continue;
++
+ // parse ##dc/##wb
+ if (n < s->nb_streams) {
+ AVStream *st;

HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/A13-atmos-substream.patch Added

@@ -0,0 +1,181 @@
+From d46e6f2723d51a9aa0c09e69bbc17ae71774b7c1 Mon Sep 17 00:00:00 2001
+From: Hendrik Leppkes <h.leppkes@gmail.com>
+Date: Fri, 26 Sep 2014 13:49:20 +0200
+Subject: [PATCH 1/2] mlpdec: support major sync headers with optional
+ extension blocks
+
+Signed-off-by: Anton Khirnov <anton@khirnov.net>
+(cherry picked from commit f36f6a608b5b2c17f8876195c61621c8f8607cee)
+Signed-off-by: Tim Walker <tdskywalker@gmail.com>
+---
+ libavcodec/mlp_parser.c | 29 ++++++++++++++++++++++++-----
+ libavcodec/mlp_parser.h | 1 +
+ libavcodec/mlpdec.c | 7 ++++++-
+ 3 files changed, 31 insertions(+), 6 deletions(-)
+
+diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
+index 075227f..0c7d4a2 100644
+--- a/libavcodec/mlp_parser.c
++++ b/libavcodec/mlp_parser.c
+@@ -119,6 +119,23 @@ static uint64_t truehd_layout(int chanmap)
+ return layout;
+ }
+ 
++static int ff_mlp_get_major_sync_size(const uint8_t * buf, int bufsize)
++{
++ int has_extension, extensions = 0;
++ int size = 28;
++ if (bufsize < 28)
++ return -1;
++
++ if (AV_RB32(buf) == 0xf8726fba) {
++ has_extension = buf[25] & 1;
++ if (has_extension) {
++ extensions = buf[26] >> 4;
++ size += 2 + extensions * 2;
++ }
++ }
++ return size;
++}
++
+ /** Read a major sync info header - contains high level information about
+ * the stream - sample rate, channel arrangement etc. Most of this
+ * information is not actually necessary for decoding, only for playback.
+@@ -127,18 +144,19 @@ static uint64_t truehd_layout(int chanmap)
+ 
+ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
+ {
+- int ratebits, channel_arrangement;
++ int ratebits, channel_arrangement, header_size;
+ uint16_t checksum;
+ 
+ assert(get_bits_count(gb) == 0);
+ 
+- if (gb->size_in_bits < 28 << 3) {
++ header_size = ff_mlp_get_major_sync_size(gb->buffer, gb->size_in_bits >> 3);
++ if (header_size < 0 || gb->size_in_bits < header_size << 3) {
+ av_log(log, AV_LOG_ERROR, "packet too short, unable to read major sync\n");
+ return -1;
+ }
+ 
+- checksum = ff_mlp_checksum16(gb->buffer, 26);
+- if (checksum != AV_RL16(gb->buffer+26)) {
++ checksum = ff_mlp_checksum16(gb->buffer, header_size - 2);
++ if (checksum != AV_RL16(gb->buffer+header_size-2)) {
+ av_log(log, AV_LOG_ERROR, "major sync info header checksum error\n");
+ return AVERROR_INVALIDDATA;
+ }
+@@ -147,6 +165,7 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
+ return AVERROR_INVALIDDATA;
+ 
+ mh->stream_type = get_bits(gb, 8);
++ mh->header_size = header_size;
+ 
+ if (mh->stream_type == 0xbb) {
+ mh->group1_bits = mlp_quants[get_bits(gb, 4)];
+@@ -197,7 +216,7 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
+ 
+ mh->num_substreams = get_bits(gb, 4);
+ 
+- skip_bits_long(gb, 4 + 11 * 8);
++ skip_bits_long(gb, 4 + (header_size - 17) * 8);
+ 
+ return 0;
+ }
+diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h
+index 7530fac..06ab421 100644
+--- a/libavcodec/mlp_parser.h
++++ b/libavcodec/mlp_parser.h
+@@ -32,6 +32,7 @@
+ typedef struct MLPHeaderInfo
+ {
+ int stream_type; ///< 0xBB for MLP, 0xBA for TrueHD
++ int header_size; ///< Size of the major sync header, in bytes
+ 
+ int group1_bits; ///< The bit depth of the first substream
+ int group2_bits; ///< Bit depth of the second substream (MLP only)
+diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
+index 6baf4c1..ad9e54f 100644
+--- a/libavcodec/mlpdec.c
++++ b/libavcodec/mlpdec.c
+@@ -132,6 +132,9 @@ typedef struct MLPDecodeContext {
+ /// Current access unit being read has a major sync.
+ int is_major_sync_unit;
+ 
++ /// Size of the major sync unit, in bytes
++ int major_sync_header_size;
++
+ /// Set if a valid major sync block has been read. Otherwise no decoding is possible.
+ uint8_t params_valid;
+ 
+@@ -346,6 +349,8 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
+ return AVERROR_PATCHWELCOME;
+ }
+ 
++ m->major_sync_header_size = mh.header_size;
++
+ m->access_unit_size = mh.access_unit_size;
+ m->access_unit_size_pow2 = mh.access_unit_size_pow2;
+ 
+@@ -1105,7 +1110,7 @@ static int read_access_unit(AVCodecContext *avctx, void* data,
+ if (read_major_sync(m, &gb) < 0)
+ goto error;
+ m->is_major_sync_unit = 1;
+- header_size += 28;
++ header_size += m->major_sync_header_size;
+ }
+ 
+ if (!m->params_valid) {
+-- 
+2.4.9 (Apple Git-60)
+
+
+From 99d4726e198d321158139f327c9c21dec58bc376 Mon Sep 17 00:00:00 2001
+From: Hendrik Leppkes <h.leppkes@gmail.com>
+Date: Fri, 26 Sep 2014 13:49:21 +0200
+Subject: [PATCH 2/2] mlpdec: support TrueHD streams with an Atmos substream
+
+The fourth substream is being discarded, since its not raw audio data,
+but an encoded Atmos stream which needs a specialized decoder.
+
+Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv
+
+Signed-off-by: Anton Khirnov <anton@khirnov.net>
+(cherry picked from commit dc2d0e06af459af9a7f91b65e0a3119acc4f1baa)
+Signed-off-by: Tim Walker <tdskywalker@gmail.com>
+---
+ libavcodec/mlp.h | 2 +-
+ libavcodec/mlpdec.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h
+index 5a4ee5f..8a1584e 100644
+--- a/libavcodec/mlp.h
++++ b/libavcodec/mlp.h
+@@ -45,7 +45,7 @@
+ /** Maximum number of substreams that can be decoded.
+ * MLP's limit is 2. TrueHD supports at least up to 3.
+ */
+-#define MAX_SUBSTREAMS 3
++#define MAX_SUBSTREAMS 4
+ 
+ /** which multiple of 48000 the maximum sample rate is */
+ #define MAX_RATEFACTOR 4
+diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
+index ad9e54f..5ace18d 100644
+--- a/libavcodec/mlpdec.c
++++ b/libavcodec/mlpdec.c
+@@ -355,7 +355,9 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
+ m->access_unit_size_pow2 = mh.access_unit_size_pow2;
+ 
+ m->num_substreams = mh.num_substreams;
+- m->max_decoded_substream = m->num_substreams - 1;
++
++ /* limit to decoding 3 substreams, as the 4th is used by Dolby Atmos for non-audio data */
++ m->max_decoded_substream = FFMIN(m->num_substreams - 1, 2);
+ 
+ m->avctx->sample_rate = mh.group1_samplerate;
+ m->avctx->frame_size = mh.access_unit_size;
+-- 
+2.4.9 (Apple Git-60)
+

HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/A13-dcadec-false-overread.patch Added

@@ -0,0 +1,23 @@
+diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
+index e988e94..a72195e 100644
+--- a/libavcodec/dcadec.c
++++ b/libavcodec/dcadec.c
+@@ -1359,12 +1359,12 @@ static int dca_subframe_footer(DCAContext *s, int base_channel)
+ align_get_bits(&s->gb); // byte align
+ skip_bits(&s->gb, 16); // nAUXCRC16
+ 
+- // additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
+- if ((reserved = (aux_data_end - get_bits_count(&s->gb))) < 0) {
+- av_log(s->avctx, AV_LOG_ERROR,
+- "Overread auxiliary data by %d bits\n", -reserved);
+- return AVERROR_INVALIDDATA;
+- } else if (reserved) {
++ /*
++ * additional data (reserved, cf. ETSI TS 102 114 V1.4.1)
++ *
++ * Note: don't check for overreads, aux_data_count can't be trusted.
++ */
++ if ((reserved = (aux_data_end - get_bits_count(&s->gb))) > 0) {
+ avpriv_request_sample(s->avctx,
+ "Core auxiliary data reserved content");
+ skip_bits_long(&s->gb, reserved);

HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/A14-mov-audio-fallback.patch Added

@@ -0,0 +1,250 @@
+diff -ur libav-v10.1.orig/libavcodec/avcodec.h libav-v10.1/libavcodec/avcodec.h
+--- libav-v10.1.orig/libavcodec/avcodec.h	2014-05-10 10:03:46.000000000 -0600
++++ libav-v10.1/libavcodec/avcodec.h	2016-01-03 11:08:50.502675261 -0700
+@@ -923,8 +923,22 @@
+ * @endcode
+ */
+ AV_PKT_DATA_H263_MB_INFO,
++
++ /**
++ * This side data contains an integer value representing the stream index
++ * of a "fallback" track. A fallback track indicates an alternate
++ * track to use when the current track can not be decoded for some reason.
++ * e.g. no decoder available for codec.
++ */
++ AV_PKT_DATA_FALLBACK_TRACK,
+ };
+ 
++typedef struct AVPacketSideData {
++ uint8_t *data;
++ int size;
++ enum AVPacketSideDataType type;
++} AVPacketSideData;
++
+ /**
+ * This structure stores compressed data. It is typically exported by demuxers
+ * and then passed as input to decoders, or received as output from encoders and
+@@ -981,11 +995,7 @@
+ * Additional packet data that can be provided by the container.
+ * Packet can contain several types of side information.
+ */
+- struct {
+- uint8_t *data;
+- int size;
+- enum AVPacketSideDataType type;
+- } *side_data;
++ AVPacketSideData *side_data;
+ int side_data_elems;
+ 
+ /**
+diff -ur libav-v10.1.orig/libavformat/avformat.h libav-v10.1/libavformat/avformat.h
+--- libav-v10.1.orig/libavformat/avformat.h	2014-05-10 10:03:46.000000000 -0600
++++ libav-v10.1/libavformat/avformat.h	2016-01-03 10:55:46.558170954 -0700
+@@ -755,6 +755,28 @@
+ */
+ AVPacket attached_pic;
+ 
++ /**
++ * An array of side data that applies to the whole stream (i.e. the
++ * container does not allow it to change between packets).
++ *
++ * There may be no overlap between the side data in this array and side data
++ * in the packets. I.e. a given side data is either exported by the muxer
++ * (demuxing) / set by the caller (muxing) in this array, then it never
++ * appears in the packets, or the side data is exported / sent through
++ * the packets (always in the first packet where the value becomes known or
++ * changes), then it does not appear in this array.
++ *
++ * - demuxing: Set by libavformat when the stream is created.
++ * - muxing: May be set by the caller before avformat_write_header().
++ *
++ * Freed by libavformat in avformat_free_context().
++ */
++ AVPacketSideData *side_data;
++ /**
++ * The number of elements in the AVStream.side_data array.
++ */
++ int nb_side_data;
++
+ /*****************************************************************
+ * All fields below this line are not part of the public API. They
+ * may not be used outside of libavformat and can be changed and
+@@ -1307,6 +1329,29 @@
+ AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
+ 
+ /**
++ * Allocate new information from stream.
++ *
++ * @param stream stream
++ * @param type desired side information type
++ * @param size side information size
++ * @return pointer to fresh allocated data or NULL otherwise
++ */
++uint8_t *av_stream_new_side_data(AVStream *stream,
++ enum AVPacketSideDataType type, int size);
++
++/**
++ * Get side information from stream.
++ *
++ * @param stream stream
++ * @param type desired side information type
++ * @param size pointer for side information size to store (optional)
++ * @return pointer to data if present or NULL otherwise
++ */
++uint8_t *av_stream_get_side_data(AVStream *stream,
++ enum AVPacketSideDataType type, int *size);
++
++
++/**
+ * Guess the file format.
+ *
+ * @param pd data to be probed
+diff -ur libav-v10.1.orig/libavformat/movenc.c libav-v10.1/libavformat/movenc.c
+--- libav-v10.1.orig/libavformat/movenc.c	2014-05-10 10:03:46.000000000 -0600
++++ libav-v10.1/libavformat/movenc.c	2016-01-03 11:25:26.833901308 -0700
+@@ -2106,10 +2106,21 @@
+ mov->tracks[i].tref_id = mov->tracks[mov->chapter_track].track_id;
+ }
+ for (i = 0; i < mov->nb_streams; i++) {
+- if (mov->tracks[i].tag == MKTAG('r','t','p',' ')) {
+- mov->tracks[i].tref_tag = MKTAG('h','i','n','t');
+- mov->tracks[i].tref_id =
+- mov->tracks[mov->tracks[i].src_track].track_id;
++ MOVTrack *track = &mov->tracks[i];
++ if (track->tag == MKTAG('r','t','p',' ')) {
++ track->tref_tag = MKTAG('h','i','n','t');
++ track->tref_id = mov->tracks[track->src_track].track_id;
++ } else if (track->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
++ int * fallback, size;
++ fallback = (int*)av_stream_get_side_data(track->st,
++ AV_PKT_DATA_FALLBACK_TRACK,
++ &size);
++ if (fallback != NULL && size == sizeof(int)) {
++ if (*fallback >= 0 && *fallback < mov->nb_streams) {
++ track->tref_tag = MKTAG('f','a','l','l');
++ track->tref_id = mov->tracks[*fallback].track_id;
++ }
++ }
+ }
+ }
+ 
+diff -ur libav-v10.1.orig/libavformat/utils.c libav-v10.1/libavformat/utils.c
+--- libav-v10.1.orig/libavformat/utils.c	2014-05-10 10:03:46.000000000 -0600
++++ libav-v10.1/libavformat/utils.c	2016-01-03 11:03:50.830126004 -0700
+@@ -2592,6 +2592,36 @@
+ return AVERROR(ENOSYS);
+ }
+ 
++static void free_stream(AVStream **pst)
++{
++ AVStream *st = *pst;
++ int i;
++
++ if (!st)
++ return;
++
++ for (i = 0; i < st->nb_side_data; i++)
++ av_freep(&st->side_data[i].data);
++ av_freep(&st->side_data);
++
++ if (st->parser)
++ av_parser_close(st->parser);
++
++ if (st->attached_pic.data)
++ av_free_packet(&st->attached_pic);
++
++ av_dict_free(&st->metadata);
++ av_freep(&st->probe_data.buf);
++ av_free(st->index_entries);
++ av_free(st->codec->extradata);
++ av_free(st->codec->subtitle_header);
++ av_free(st->codec);
++ av_free(st->priv_data);
++ av_free(st->info);
++
++ av_freep(pst);
++}
++
+ void avformat_free_context(AVFormatContext *s)
+ {
+ int i;
+@@ -2603,21 +2633,7 @@
+ 
+ for (i = 0; i < s->nb_streams; i++) {
+ /* free all data in a stream component */
+- st = s->streams[i];
+- if (st->parser) {
+- av_parser_close(st->parser);
+- }
+- if (st->attached_pic.data)
+- av_free_packet(&st->attached_pic);
+- av_dict_free(&st->metadata);
+- av_freep(&st->probe_data.buf);
+- av_free(st->index_entries);
+- av_free(st->codec->extradata);
+- av_free(st->codec->subtitle_header);
+- av_free(st->codec);
+- av_free(st->priv_data);
+- av_free(st->info);
+- av_free(st);
++ free_stream(&s->streams[i]);
+ }
+ for (i = s->nb_programs - 1; i >= 0; i--) {
+ av_dict_free(&s->programs[i]->metadata);
+@@ -3490,3 +3506,56 @@
+ 
+ return 0;
+ }
++
++uint8_t *av_stream_get_side_data(AVStream *st, enum AVPacketSideDataType type,
++ int *size)
++{
++ int i;
++
++ for (i = 0; i < st->nb_side_data; i++) {
++ if (st->side_data[i].type == type) {
++ if (size)
++ *size = st->side_data[i].size;
++ return st->side_data[i].data;
++ }
++ }
++ return NULL;
++}
++
++uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
++ int size)
++{
++ AVPacketSideData *sd, *tmp;
++ int i;
++ uint8_t *data = av_malloc(size);
++
++ if (!data)
++ return NULL;
++
++ for (i = 0; i < st->nb_side_data; i++) {
++ sd = &st->side_data[i];
++
++ if (sd->type == type) {
++ av_freep(&sd->data);
++ sd->data = data;
++ sd->size = size;
++ return sd->data;
++ }
++ }
++
++ tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp));
++ if (!tmp) {
++ av_freep(&data);
++ return NULL;
++ }
++
++ st->side_data = tmp;
++ st->nb_side_data++;
++
++ sd = &st->side_data[st->nb_side_data - 1];
++ sd->type = type;
++ sd->data = data;
++ sd->size = size;
++ return data;
++}
++

HandBrake-0.10.2.tar.bz2/contrib/ffmpeg/module.defs -> HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/module.defs Changed

HandBrake-0.10.2.tar.bz2/contrib/x265/module.defs -> HandBrake-0.10.5.tar.bz2/contrib/x265/module.defs Changed

HandBrake-0.10.2.tar.bz2/doc/texi/Building.linux.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/Building.linux.texi Changed

HandBrake-0.10.2.tar.bz2/doc/texi/base/handbrake.texi.m4 -> HandBrake-0.10.5.tar.bz2/doc/texi/base/handbrake.texi.m4 Changed

HandBrake-0.10.2.tar.bz2/doc/texi/building/appendix.repo.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/building/appendix.repo.texi Changed

HandBrake-0.10.2.tar.bz2/doc/texi/building/chapter.via.terminal.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/building/chapter.via.terminal.texi Changed

HandBrake-0.10.2.tar.bz2/doc/texi/building/command.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/building/command.texi Changed

HandBrake-0.10.2.tar.bz2/doc/texi/building/prerequisites.common.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/building/prerequisites.common.texi Changed

HandBrake-0.10.2.tar.bz2/gtk/po/LINGUAS -> HandBrake-0.10.5.tar.bz2/gtk/po/LINGUAS Changed

HandBrake-0.10.2.tar.bz2/gtk/po/cs.po -> HandBrake-0.10.5.tar.bz2/gtk/po/cs.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/da.po -> HandBrake-0.10.5.tar.bz2/gtk/po/da.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/de.po -> HandBrake-0.10.5.tar.bz2/gtk/po/de.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/es.po -> HandBrake-0.10.5.tar.bz2/gtk/po/es.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/fr.po -> HandBrake-0.10.5.tar.bz2/gtk/po/fr.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/it_IT.po -> HandBrake-0.10.5.tar.bz2/gtk/po/it_IT.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/ja_JP.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ja_JP.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/ko.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ko.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/no.po -> HandBrake-0.10.5.tar.bz2/gtk/po/no.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/pt_BR.po -> HandBrake-0.10.5.tar.bz2/gtk/po/pt_BR.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/ro_RO.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ro_RO.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/ru.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ru.po Changed

HandBrake-0.10.2.tar.bz2/gtk/po/th.po -> HandBrake-0.10.5.tar.bz2/gtk/po/th.po Changed

HandBrake-0.10.5.tar.bz2/gtk/po/zh_CN.po Added

@@ -0,0 +1,2878 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Translators:
+# helinb <1696060289@qq.com>, 2015
+# Hu XiaoKe <hot123tea123@gmail.com>, 2015
+# 玉堂白鹤 <yjwork@qq.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Handbrake-0.10.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-03 13:01+0300\n"
+"PO-Revision-Date: 2015-09-25 11:08+0800\n"
+"Last-Translator: helinb <1696060289@qq.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/victorr2007/handbrake-0102/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.8.4\n"
+
+msgid "Quality: "
+msgstr "画质："
+
+#, c-format
+msgid "Bitrate: %dkbps"
+msgstr "码率: %dkbps"
+
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr "码率: %.4gkbps"
+
+msgid "Passthrough"
+msgstr "通过"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+"%s\n"
+"增益: %s\n"
+"动态范围控制 DRC: %s\n"
+"音轨名: %s"
+
+#, c-format
+msgid ""
+"%s\n"
+"Gain: %s\n"
+"DRC: %s"
+msgstr ""
+"%s\n"
+"增益: %s\n"
+"DRC: %s"
+
+msgid "Add"
+msgstr "添加"
+
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+msgid "Set the audio codec to encode this track with."
+msgstr "设置该轨道的音频编码。"
+
+msgid "Set the bitrate to encode this track with."
+msgstr "设置该轨道的码率"
+
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+"音质：\n"
+"调节输出视频的音频质量，需要编码器支持。"
+
+msgid "Set the mixdown of the output audio track."
+msgstr "设置输出音轨的混音。"
+
+msgid "Set the sample rate of the output audio track."
+msgstr "设置输出音轨的采样率。"
+
+msgid ""
+"Audio Gain:\n"
+"Adjust the amplification or attenuation of the output audio track."
+msgstr ""
+"音频增益：\n"
+"调节输出音轨的增益。"
+
+msgid "0dB"
+msgstr "0dB"
+
+msgid "%ddB"
+msgstr "%ddB"
+
+msgid "%.4gkHz"
+msgstr "%.4gkHz"
+
+msgid "%d - %s (%.4gkHz)"
+msgstr "%d - %s (%.4gkHz)"
+
+msgid ""
+"Dynamic Range Compression:\n"
+"Adjust the dynamic range of the output audio track.\n"
+"For source audio that has a wide dynamic range,\n"
+"very loud and very soft sequences, DRC allows you\n"
+"to 'compress' the range by making loud sounds\n"
+"softer and soft sounds louder.\n"
+msgstr ""
+"动态范围压缩：<\\b>\n"
+"动态调整输出音频的幅值。\n"
+"对于幅值较大的源音频，\n"
+"DRC 可以压缩幅值范围，\n"
+"将大音频信号压制在某个范围内，\n"
+"将小音频信号适当提升。\n"
+
+msgid "Remove this audio encoder"
+msgstr "移除此音频编码"
+
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr "关闭 HandBrake 将会结束编码。\n"
+
+msgid "No Title Found"
+msgstr "找不到标题"
+
+msgid "none"
+msgstr "无"
+
+msgid "Not Selected"
+msgstr "没有选中的"
+
+msgid "zerolatency x264 tune selected, forcing constant framerate"
+msgstr ""
+
+msgid "Scanning ..."
+msgstr "扫描中 ..."
+
+msgid "Stop Scan"
+msgstr "停止扫描"
+
+msgid "On"
+msgstr "开启"
+
+msgid "Strict"
+msgstr "严格"
+
+msgid "Loose"
+msgstr "宽松"
+
+msgid "Custom"
+msgstr "自定义"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "auto"
+msgstr "自动"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+"%s\n"
+"\n"
+"%s ，共 %d 秒 ..."
+
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr "%s您的电影将会丢失，如果您不继续编码。"
+
+msgid "Cancel Current and Stop"
+msgstr "取消当前并停止"
+
+msgid "Cancel Current, Start Next"
+msgstr "取消当前，开始下一个"
+
+msgid "Finish Current, then Stop"
+msgstr "完成当前，然后停止"
+
+msgid "Continue Encoding"
+msgstr "继续编码"
+
+msgid "Custom "
+msgstr "自定义"
+
+msgid "Modified "
+msgstr "修改"
+
+#, c-format
+msgid "Handbrake Version: %s (%d)\n"
+msgstr "Handbrake 版本: %s (%d)\n"
+
+#, c-format
+msgid "%d encode(s) pending"
+msgstr "%d 个编码等待执行"
+
+#, c-format
+msgid "job %d of %d, "
+msgstr "作业 %d of %d, "
+
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr "编码进行中: %s%s%.2f %% (%.2f fps, 平均 %.2f fps, 还需 %02d小时%02d分%02d秒)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr "编码进行中：%s%s%.2f %% (还需 %02d小时%02d分%02d秒)"
+
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr "编码进行中: %s%s%.2f %%"
+
+msgid "Searching for start time, "
+msgstr "搜索开始时间，"
+
+msgid "Scanning..."
+msgstr "扫描中"
+
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+msgid "Source"
+msgstr "源文件"
+
+msgid "Choose Video Source"
+msgstr "选择视频源文件"
+
+msgid "Paused"
+msgstr "暂停"
+
+msgid "Encode Done!"
+msgstr "编码完成！"
+
+msgid "Encode Canceled."
+msgstr "编码取消。"
+
+msgid "Encode Failed."
+msgstr "编码失败。"
+
+msgid "Muxing: This may take a while..."
+msgstr "混流中：这可能需要一段时间..."
+
+msgid "Scan this DVD source"
+msgstr "扫描 DVD 源"
+
+msgid "AutoScan"
+msgstr "自动扫描"
+
+msgid "Suspend"
+msgstr "挂起"
+
+#, c-format
+msgid "Suspend failed: %s"
+msgstr "挂起失败: %s"
+
+msgid "Suspend failed"
+msgstr "挂起失败"
+
+msgid "Shutdown"
+msgstr "关机"
+
+#, c-format
+msgid "Shutdown failed: %s"
+msgstr "关机失败: %s"
+
+msgid "Shutdown failed"
+msgstr "关机失败"
+
+msgid "Encoding"
+msgstr "编码中"
+
+#, c-format
+msgid "press %d %d"
+msgstr "存在 %d %d"
+
+#, c-format
+msgid ""
+"Invalid Settings:\n"
+"%s"
+msgstr ""
+"无效设置:\n"
+"%s"
+
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (警告：无损)"
+
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr "HandBrake %s/%s 现在可用 (您拥有 %s/%d)。"
+
+msgid "Encode Complete"
+msgstr "编码完成"
+
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr "放下手中的鸡尾酒，您的 HandBrake 队列完成了！"
+
+msgid "Your encode is complete."
+msgstr "您的编码已完成。"
+
+msgid "Shutting down the computer"
+msgstr "关闭计算机"
+
+msgid "Putting computer to sleep"
+msgstr "将计算机转入休眠"
+
+msgid "Quiting Handbrake"
+msgstr "退出 HandBrake"
+
+msgid "Bottom"
+msgstr "底部"
+
+#, c-format
+msgid "open failed: %s\n"
+msgstr "无法打开: %s\n"
+
+msgid "No key for dictionary item"
+msgstr ""
+
+msgid "Invalid container type. This shouldn't happen"
+msgstr "无效的容器类型，这不应该发生啊。"
+
+#, c-format
+msgid "%s:missing a requried attribute"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [-I <inc path>] <in resource list> <out resource plist>\n"
+"Summary:\n"
+" Creates a resource plist from a resource list\n"
+"Options:\n"
+" I - Include path to search for files\n"
+" <in resource list> Input resources file\n"
+" <out resource plist> Output resources plist file\n"
+msgstr ""
+
+msgid "language"
+msgstr "语言"
+
+msgid "Language"
+msgstr "语言"
+
+msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it"
+msgstr ""
+
+msgid "The preferred place to ellipsize the string, if the cell renderer does not have enough room to display the entire string"
+msgstr ""
+
+msgid "How to break the string into multiple lines, if the cell renderer does not have enough room to display the entire string"
+msgstr "如果该行无法显示完整的字符串，应该如何将其拆分为多行"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+"在视频上渲染字幕。\n"
+"\n"
+"字幕将成为视频的一部，并且无法禁止显示。"
+
+msgid "Burned In"
+msgstr "烧录"
+
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+msgid "Default"
+msgstr "默认"
+
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+"只使用标记为强制\n"
+"使用的字幕轨道\n"
+"\n"
+"强制使用的字幕通常\n"
+"用于视频中在说外语\n"
+"的时候。"
+
+msgid "Forced Only"
+msgstr "只使用强制显示字幕"
+
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+"增加（或减少） SRT 字幕\n"
+"显示的时间偏移（单位是毫秒）\n"
+"\n"
+"有时候，外挂 SRT 字幕\n"
+"与视频不同步。\n"
+"这个设置可以使它们同步。"
+
+msgid "SRT Offset"
+msgstr "SRT 字幕时间偏移"
+
+msgid "Off"
+msgstr "关闭"
+
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Search\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+msgid "Track"
+msgstr "轨道"
+
+msgid "About HandBrake"
+msgstr "关于 HandBrake"
+
+msgid ""
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr ""
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+
+msgid "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr "HandBrake 是一个遵循GPL许可，多平台，多线程的视频编码器。"
+
+msgid "http://handbrake.fr"
+msgstr "http://handbrake.fr"
+
+msgid ""
+"HandBrake is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"\n"
+"HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"HandBrake 是一款自由软件；您可以在 自由软件基金会发布的 GNU 通用公共许可证（第2版，或更新的版本）下再分发或者修改。\n"
+"HandBrake 希望能够帮到您，但无任何形式的担保责任，其包括但不限于，就适售性以及特定目的的适用性为默示性担保。详情参见 GNU 通用公共许可证全文。\n"
+"\n"
+"您应当随程序收到了 GNU 通用公共许可证的一份拷贝；如果没有，您可以写信到 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 索取。"
+
+msgid "_Minimize/Maximize"
+msgstr "最小化/最大化(_M)"
+
+msgid "_Pause Queue"
+msgstr "暂停队列(_P)"
+
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+msgid "_About"
+msgstr "关于(_A)"
+
+msgid "HandBrake"
+msgstr "HandBrake"
+
+msgid "_File"
+msgstr "文件(_F)"
+
+msgid "_Source"
+msgstr "源文件(_S)"
+
+msgid "Single _Title"
+msgstr ""
+
+msgid "_Destination"
+msgstr "目标文件(_D)"
+
+msgid "_Preferences"
+msgstr "首选项(_P)"
+
+msgid "_Queue"
+msgstr "队列(_Q)"
+
+msgid "_Add"
+msgstr "添加(_A)"
+
+msgid "Add _Multiple"
+msgstr "添加多个(_M)"
+
+msgid "_Start"
+msgstr "开始(_S)"
+
+msgid "_Pause"
+msgstr "暂停(_P)"
+
+msgid "_View"
+msgstr "视图(_V)"
+
+msgid "HandBrake For _Dumbies"
+msgstr "初学者使用 HandBrake (_D)"
+
+msgid "_Show Presets"
+msgstr "显示预设(_S)"
+
+msgid "_Preview"
+msgstr "预览(_P)"
+
+msgid "_Activity Window"
+msgstr "活动日志窗口(_A)"
+
+msgid "Show _Queue"
+msgstr "显示队列（_Q)"
+
+msgid "_Presets"
+msgstr "预设值(_P)"
+
+msgid "_Save"
+msgstr "保存(_S)"
+
+msgid "_Delete"
+msgstr "删除(_D)"
+
+msgid "_Make Default"
+msgstr "设为默认(_M)"
+
+msgid "_New Folder"
+msgstr "新建文件夹(_N)"
+
+msgid "_Export"
+msgstr "导出(_E)"
+
+msgid "_Import"
+msgstr "导入(_I)"
+
+msgid "_Update Built-in Presets"
+msgstr "更新内建预设(_U)"
+
+msgid "_Help"
+msgstr "帮助(_H)"
+
+msgid "_Guide"
+msgstr "手册(_G)"
+
+msgid "Start Encoding"
+msgstr "开始编码"
+
+msgid "Start"
+msgstr "开始"
+
+msgid "Pause Encoding"
+msgstr "暂停编码"
+
+msgid "Pause"
+msgstr "暂停"
+
+msgid "Add to Queue"
+msgstr "添加到队列"
+
+msgid "Enqueue"
+msgstr "排队"
+
+msgid "Show Queue"
+msgstr "显示队列"
+
+msgid "Queue"
+msgstr "队列"
+
+msgid "Failed to find widget"
+msgstr ""
+
+msgid "Choose Destination"
+msgstr ""
+
+#, c-format
+msgid "%s%sPreset: %s"
+msgstr ""
+
+#, c-format
+msgid "Queue (%d)"
+msgstr ""
+
+msgid "Updating preview\n"
+msgstr ""
+
+msgid "Update Check"
+msgstr ""
+
+msgid "Error while reading activity from pipe"
+msgstr ""
+
+msgid "Updating chapter row ui"
+msgstr ""
+
+#, c-format
+msgid "udev: Failed to lookup device %s"
+msgstr ""
+
+msgid "Cache Volume Names"
+msgstr ""
+
+#, c-format
+msgid "DBUS cannot connect: %s"
+msgstr ""
+
+#, c-format
+msgid "Could not get DBUS proxy: %s"
+msgstr ""
+
+msgid "Delete All"
+msgstr ""
+
+msgid "Delete all items in the queue."
+msgstr ""
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value\n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel\n"
+" aspect ratio</tt>"
+msgstr ""
+
+msgid ""
+"Open Picture Settings and Preview window.\n"
+"Here you can adjust cropping, resolution, aspect ratio, and filters."
+msgstr ""
+"打开图像设置和预览窗口。\n"
+"在这里，您可以调整裁剪，分辨率，宽高比和过滤器。"
+
+msgid "Preview"
+msgstr "预览"
+
+msgid "Show Activity Window"
+msgstr "显示活动日志窗口"
+
+msgid "Activity"
+msgstr "活动日志"
+
+msgid "Source:"
+msgstr "源文件:"
+
+msgid "None"
+msgstr "无"
+
+msgid "Foreign Audio Subtitle Track"
+msgstr ""
+
+msgid "First Selected Track"
+msgstr ""
+
+msgid "Foreign Audio, then First Selected Track"
+msgstr ""
+
+msgid "Title:"
+msgstr "标题:"
+
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+msgid "Angle:"
+msgstr "角度："
+
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr "用于在多角度的 DVD 中，选择所希望的角度来进行编码。"
+
+msgid "Reset All Titles"
+msgstr "重置所有标题"
+
+msgid "Apply current settings to all titles"
+msgstr "对所有标题应用当前设置"
+
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr "需要编码的标题范围。可以是章节，秒或帧。"
+
+msgid "Set the first chapter to encode."
+msgstr "设置起始章节"
+
+msgid "Set the last chapter to encode."
+msgstr "设置终止章节"
+
+msgid "Duration:"
+msgstr "持续时长："
+
+msgid "hh:mm:ss"
+msgstr ""
+
+msgid "Destination"
+msgstr "目标"
+
+msgid "File:"
+msgstr "文件:"
+
+msgid "Destination filename for your encode."
+msgstr "编码的目标文件名。"
+
+msgid "Destination directory for your encode."
+msgstr "编码的目标文件夹。"
+
+msgid "Destination Directory"
+msgstr "目标文件夹"
+
+msgid "Format:"
+msgstr "格式:"
+
+msgid "Format to mux encoded tracks to."
+msgstr ""
+
+msgid "iPod 5G Support"
+msgstr "iPod 5G 支持"
+
+msgid "Add iPod Atom needed by some older iPods."
+msgstr ""
+
+msgid "Web optimized"
+msgstr "为网络观看做优化"
+
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+msgid "Large file (>4GB)"
+msgstr "大文件 (>4GB)"
+
+msgid ""
+"Allow 64 bit MP4 file which can be over 4GB.\n"
+"\n"
+"Caution: This option may break device compatibility."
+msgstr ""
+
+msgid "Presets List"
+msgstr "预设列表"
+
+msgid "Source Codec:"
+msgstr "源文件编码:"
+
+msgid "--"
+msgstr ""
+
+msgid "Dimensions:"
+msgstr "尺寸:"
+
+msgid "Aspect: "
+msgstr "长宽比："
+
+msgid "Frame Rate:"
+msgstr "帧率:"
+
+msgid "Source Picture Parameters"
+msgstr "源图像参数"
+
+msgid "Autocrop:"
+msgstr "自动裁剪"
+
+msgid "Crop:"
+msgstr "裁剪："
+
+msgid "Crop Dimensions:"
+msgstr "裁剪尺寸："
+
+msgid "Cropping"
+msgstr "裁剪"
+
+msgid "Scale Dimensions:"
+msgstr "缩放尺寸："
+
+msgid "Optimal for Source:"
+msgstr ""
+
+msgid "Anamorphic:"
+msgstr "变形："
+
+msgid "Scaling"
+msgstr "缩放"
+
+msgid "Presentation Dimensions:"
+msgstr "演示尺寸："
+
+msgid "Summary"
+msgstr "摘要"
+
+msgid "Left Crop"
+msgstr "左剪裁"
+
+msgid "Top Crop"
+msgstr "顶部裁剪"
+
+msgid "Bottom Crop"
+msgstr "底部裁剪"
+
+msgid "Right Crop"
+msgstr "右剪裁"
+
+msgid "Auto Crop"
+msgstr "自动剪裁"
+
+msgid "Automatically crop black borders around edges of the video."
+msgstr "自动裁剪黑边。"
+
+msgid "Loose Crop"
+msgstr ""
+
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+msgid "width:"
+msgstr "宽："
+
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "height:"
+msgstr "高"
+
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+msgid "Optimal for source"
+msgstr ""
+
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Align dimensions to chosen 'Alignment' value\n"
+" and pick pixel aspect ratio that preserves the\n"
+" original display aspect ratio\n"
+"Strict - Keep original source dimensions and pixel\n"
+" aspect ratio</tt>"
+msgstr ""
+
+msgid "Alignment:"
+msgstr "对齐方式："
+
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+msgid "Storage Geometry"
+msgstr ""
+
+msgid "This is the display width. It is the result of scaling the storage dimensions by the pixel aspect."
+msgstr ""
+
+msgid "Pixel Aspect:"
+msgstr "像素宽高比："
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid ":"
+msgstr ":"
+
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+msgid "Keep Aspect"
+msgstr "保持宽高比"
+
+msgid "If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+
+msgid "Display Aspect:"
+msgstr "显示宽高比："
+
+msgid "--:--"
+msgstr ""
+
+msgid "Display Geometry"
+msgstr ""
+
+msgid "Grayscale"
+msgstr "灰度"
+
+msgid "If enabled, filter colour components out of video."
+msgstr "如果启用，将过滤输出文件的色彩部分"
+
+msgid "Deblock:"
+msgstr "去块滤波"
+
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+msgid "Denoise Filter:"
+msgstr "降噪滤镜"
+
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+msgid "Denoise Preset:"
+msgstr "降噪预设"
+
+msgid "Denoise Tune:"
+msgstr ""
+
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+msgid "Detelecine:"
+msgstr ""
+
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+msgid "Decomb"
+msgstr ""
+
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced.\n"
+"\n"
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid "Deinterlace"
+msgstr "隔行扫描"
+
+msgid "Decomb:"
+msgstr ""
+
+msgid ""
+"The decomb filter selectively deinterlaces frames that appear to be interlaced.\n"
+"This will preserve quality in frames that are not interlaced."
+msgstr ""
+
+msgid ""
+"Custom decomb filter string format\n"
+"\n"
+"Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:\n"
+"BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:\n"
+"ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity"
+msgstr ""
+
+msgid "Deinterlace:"
+msgstr "隔行扫描："
+
+msgid ""
+"The classic deinterlace filter is applied to all frames.\n"
+"Frames that are not interlaced will suffer some quality degradation."
+msgstr ""
+
+msgid ""
+"Custom deinterlace filter string format\n"
+"\n"
+"YadifMode:YadifParity:McdintMode:McdeintQp"
+msgstr ""
+
+msgid "Filters"
+msgstr "过滤器"
+
+msgid "Picture"
+msgstr "图像"
+
+msgid "Video Encoder:"
+msgstr "视频编码器："
+
+msgid "Available video encoders."
+msgstr "可用的视频编码器。"
+
+msgid "Framerate:"
+msgstr "帧率："
+
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+
+msgid "Constant Framerate"
+msgstr "固定帧率"
+
+msgid "Same as source"
+msgstr "与源视频相同"
+
+msgid "kbps"
+msgstr "kbps"
+
+msgid "(variable)"
+msgstr "(动态)"
+
+msgid "(constant)"
+msgstr "(固定)"
+
+msgid "Enables constant framerate output."
+msgstr ""
+
+msgid "Peak Framerate (VFR)"
+msgstr "峰值帧率 (VFR)"
+
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+msgid "Variable Framerate"
+msgstr "动态帧率"
+
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+"启用动态帧率。\n"
+"\n"
+"一些播放器与动态帧率不兼容。"
+
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+msgid "Constant Quality:"
+msgstr "恒定画质："
+
+msgid "Bitrate (kbps): "
+msgstr "码率 (kbps): "
+
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+msgid "2-Pass Encoding"
+msgstr "二次编码"
+
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+msgid "Turbo First Pass"
+msgstr "加快首次编码"
+
+msgid "During the 1st pass of a 2 pass encode, use settings that speed things along."
+msgstr ""
+
+msgid "Use Advanced Options"
+msgstr "使用高级视频选项"
+
+msgid ""
+"Use advanced options Tab for x264 settings.\n"
+"\n"
+"Use at your own risk!"
+msgstr ""
+"使用高级视频选项卡中的设置。\n"
+"\n"
+"风险自负!"
+
+msgid "Preset:"
+msgstr "预设："
+
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+msgid "Tune:"
+msgstr "优化："
+
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve effeciency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+msgid "Fast Decode"
+msgstr "快速解码"
+
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+"减少编码 CPU 消耗。\n"
+"\n"
+"如果您的输出在设备上播放不流畅（掉帧），请勾选此选项。"
+
+msgid "Zero Latency"
+msgstr "零延迟"
+
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+msgid "Profile:"
+msgstr "规格："
+
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "Level:"
+msgstr "级别："
+
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+msgid "More Settings:"
+msgstr "更多设置："
+
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+msgid "Video"
+msgstr "视频"
+
+msgid "Selection Behavior:"
+msgstr "选择行为："
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "Available Languages"
+msgstr "可用语言"
+
+msgid "Selected Languages"
+msgstr "已选择语言"
+
+msgid "Use only first encoder for secondary audio"
+msgstr "仅使用第一编码器，用于辅助音频"
+
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+msgid "Auto Passthru:"
+msgstr "自动复制流："
+
+msgid "MP3"
+msgstr "MP3"
+
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AAC"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "AC-3"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "DTS-HD"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "EAC-3"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports EAC-3.\n"
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "TrueHD"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports TrueHD.\n"
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "FLAC"
+msgstr ""
+
+msgid ""
+"Enable this if your playback device supports FLAC.\n"
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+msgid "Passthru Fallback:"
+msgstr ""
+
+msgid "Set the audio codec to encode with when a suitable track can not be found for audio passthru."
+msgstr ""
+
+msgid "Audio Encoder Settings:"
+msgstr "音频编码设置:"
+
+msgid "Each selected source track will be encoded with all selected encoders"
+msgstr ""
+
+msgid "Encoder"
+msgstr "编码"
+
+msgid "Bitrate/Quality"
+msgstr "比特率/质量"
+
+msgid "Mixdown"
+msgstr "混音"
+
+msgid "Samplerate"
+msgstr "采样率"
+
+msgid "Gain"
+msgstr "增益"
+
+msgid "DRC"
+msgstr ""
+
+msgid "Audio Defaults"
+msgstr "默认音频"
+
+msgid "Add new audio settings to the list"
+msgstr "添加新的音频设置至列表"
+
+msgid "Add All"
+msgstr "全部添加"
+
+msgid "Add all audio tracks to the list"
+msgstr "将所有音轨到列表"
+
+msgid "Reload Defaults"
+msgstr "重载默认"
+
+msgid "Reload all audio settings from defaults"
+msgstr "重新加载所有音频的默认设置"
+
+msgid "Audio List"
+msgstr "音频列表"
+
+msgid ""
+"Create a list of languages you would like to select subtitles for.\n"
+"\n"
+"The first language in this list is your \"preferred\" language and will be used\n"
+"for determining subtitle selection settings when there is foreign audio."
+msgstr ""
+
+msgid "Preferred Language: None"
+msgstr "首选语言：无"
+
+msgid "Add Foreign Audio Search Pass"
+msgstr ""
+
+msgid ""
+"Add \"Foreign Audio Search\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them."
+msgstr ""
+
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+msgid "When the default audio track is not your preferred language, add a subtitle track."
+msgstr ""
+
+msgid "Add Closed Captions when available"
+msgstr ""
+
+msgid "Closed captions are text subtitles that can be added to any container as a soft subtitle track"
+msgstr ""
+
+msgid "Burn-In Behavior:"
+msgstr ""
+
+msgid ""
+"Set the behavior of subtitle \"Burn-In\".\n"
+"\n"
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+msgid "Burn-In for deficient players:"
+msgstr ""
+
+msgid "DVD Subtitles"
+msgstr ""
+
+msgid ""
+"Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+msgid "Blu-ray Subtitles"
+msgstr ""
+
+msgid ""
+"Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+msgid "* Only one of the above subtitle burn options will be applied, starting with the top."
+msgstr ""
+
+msgid "Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+msgid "Subtitle Defaults"
+msgstr "默认字幕"
+
+msgid "Add new subtitle settings to the list"
+msgstr "新增的字幕添加到列表"
+
+msgid "Add all subtitle tracks to the list"
+msgstr "将所有字幕轨道到列表"
+
+msgid "Reload all subtitle settings from defaults"
+msgstr "从默认设置加载所有字幕设置"
+
+msgid "Subtitle List"
+msgstr "字幕列表"
+
+msgid "Reference Frames:"
+msgstr "参考帧范围:"
+
+msgid ""
+"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
+"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
+"\n"
+"Note that many hardware devices have limitations on the number of supported reference\n"
+"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
+"you're absolutely sure you know what you're doing!"
+msgstr ""
+
+msgid "Maximum B-Frames:"
+msgstr "最长B帧序列长:"
+
+msgid ""
+"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
+"\n"
+"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
+"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
+"values.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
+msgstr ""
+
+msgid "Pyramidal B-Frames:"
+msgstr "B帧金字塔序列:"
+
+msgid ""
+"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
+"of B-frames, allowing B-frames to reference each other to improve compression.\n"
+"\n"
+"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
+msgstr ""
+
+msgid "Weighted P-Frames:"
+msgstr "加权P帧:"
+
+msgid ""
+"Performs extra analysis to decide upon weighting parameters for each frame.\n"
+"\n"
+"This improves overall compression slightly and improves the quality of fades greatly.\n"
+"\n"
+"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
+"prediction to be disabled. Note that some devices and players, even those that support\n"
+"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
+"completely incompatible with it, for example."
+msgstr ""
+
+msgid "8x8 Transform"
+msgstr "8x8 变换"
+
+msgid ""
+"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
+"\n"
+"It improves compression by at least 5% at a very small speed cost and may\n"
+"provide an unusually high visual quality benefit compared to its compression\n"
+"gain. However, it requires High Profile, which many devices may not support."
+msgstr ""
+
+msgid "CABAC Entropy Encoding"
+msgstr ""
+
+msgid ""
+"After the encoder has done its work, it has a bunch of data that\n"
+"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
+"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
+"compresses significantly better (10-30%), especially at lower bitrates.\n"
+"\n"
+"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
+"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
+msgstr ""
+
+msgid "Encoding Features"
+msgstr "编码特性"
+
+msgid "Motion Est. Method:"
+msgstr ""
+
+msgid ""
+"Controls the motion estimation method.\n"
+"\n"
+"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
+"A better motion search method improves compression at the cost of speed.\n"
+"\n"
+"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
+"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
+"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
+"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
+"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
+msgstr ""
+
+msgid "Subpel ME &amp; Mode:"
+msgstr ""
+
+msgid ""
+"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
+"\n"
+"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
+"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
+"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
+"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
+"11 disables all early terminations in analysis.\n"
+"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
+msgstr ""
+
+msgid "Motion Est. Range:"
+msgstr ""
+
+msgid ""
+"This is the distance x264 searches from its initial guess at the\n"
+"motion of a block in order to try to find its actual motion.\n"
+"\n"
+"The default is fine for most content, but extremely high motion video,\n"
+"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
+"a high speed cost."
+msgstr ""
+
+msgid "Adaptive Direct Mode:"
+msgstr ""
+
+msgid ""
+"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
+"\n"
+"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
+"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
+"adaptively select which is better for each particular frame."
+msgstr ""
+
+msgid "Adaptive B-Frames:"
+msgstr ""
+
+msgid ""
+"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
+"\n"
+"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
+"However, while fast, its decisions are often suboptimal.\n"
+"\n"
+"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
+"but makes much more accurate decisions, especially when used with B-pyramid."
+msgstr ""
+
+msgid "Partitions:"
+msgstr ""
+
+msgid ""
+"Mode decision picks from a variety of options to make its decision:\n"
+"this option chooses what options those are.\n"
+"\n"
+"Fewer partitions to check means faster encoding, at the cost of worse\n"
+"decisions, since the best option might have been one that was turned off."
+msgstr ""
+
+msgid "Trellis:"
+msgstr ""
+
+msgid ""
+"Trellis fine-tunes the rounding of transform coefficients to\n"
+"squeeze out 3-5% more compression at the cost of some speed.\n"
+"\n"
+"\"Always\" uses trellis not only during the main encoding process, but also\n"
+"during analysis, which improves compression even more, albeit at great speed cost.\n"
+"\n"
+"Trellis costs more speed at higher bitrates and requires CABAC."
+msgstr ""
+
+msgid "Analysis"
+msgstr ""
+
+msgid "Adaptive Quantization Strength:"
+msgstr ""
+
+msgid ""
+"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
+"\n"
+"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
+msgstr ""
+
+msgid "Psychovisual Rate Distortion:"
+msgstr ""
+
+msgid ""
+"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
+"vision to dramatically improve apparent detail and sharpness.\n"
+"The effect can be made weaker or stronger by adjusting the strength.\n"
+"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+msgstr ""
+
+msgid "Psychovisual Trellis:"
+msgstr ""
+
+msgid ""
+"Psychovisual trellis is an experimental algorithm to further\n"
+"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
+"\n"
+"Recommended values are around 0.2, though higher values may help for very\n"
+"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
+"and other sharp-edged graphics."
+msgstr ""
+
+msgid "Deblocking: "
+msgstr "去区块效应:"
+
+msgid ""
+"H.264 deblocking filter.\n"
+"\n"
+"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
+"after decoding each frame. This not only improves visual quality, but also\n"
+"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
+"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
+"\n"
+"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
+"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
+"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
+"The default is 0 (normal strength) for both parameters."
+msgstr ""
+
+msgid "No DCT Decimate"
+msgstr "禁用DCT跳过"
+
+msgid ""
+"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
+"be better used for some other purpose in the video. However, this can\n"
+"sometimes have slight negative effects on retention of subtle grain and\n"
+"dither.\n"
+"\n"
+"Don't touch this unless you're having banding issues or other such cases\n"
+"where you are having trouble keeping fine noise."
+msgstr ""
+
+msgid "Psychovisual"
+msgstr ""
+
+msgid ""
+"Your selected options will appear here.\n"
+"You can edit these and add additional options.\n"
+"\n"
+"Default values will not be shown. The defaults are:\n"
+"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
+"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
+"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
+"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
+"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+msgstr ""
+
+msgid "Current x264 Advanced Option String"
+msgstr ""
+
+msgid "Advanced Video"
+msgstr "高级视频"
+
+msgid "Chapter Markers"
+msgstr "章节标记"
+
+msgid "Add chapter markers to output file."
+msgstr "添加章节标记到输出文件。"
+
+msgid "Chapters"
+msgstr "章节"
+
+msgid "Actors:"
+msgstr "演员："
+
+msgid "Director:"
+msgstr "导演："
+
+msgid "Release Date:"
+msgstr "发布日期："
+
+msgid "Comment:"
+msgstr "评论："
+
+msgid "Genre:"
+msgstr "种类："
+
+msgid "Description:"
+msgstr "描述："
+
+msgid "Plot:"
+msgstr "剧情："
+
+msgid "Tags"
+msgstr "标签"
+
+msgid "Settings"
+msgstr "设置"
+
+msgid "Edit"
+msgstr "编辑"
+
+msgid "Reload"
+msgstr "重新加载"
+
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+msgid "Reload All"
+msgstr "全部重载"
+
+msgid ""
+"Mark all queue entries as pending.\n"
+"Resets all queue jobs to pending and ready to run again."
+msgstr ""
+
+msgid "Save Queue"
+msgstr ""
+
+msgid ""
+"Save the current queue of encode jobs to a file.\n"
+"This file may be reloaded at a later time to edit your jobs and re-encode."
+msgstr ""
+
+msgid "Load Queue File"
+msgstr ""
+
+msgid "Load a previously saved queue file."
+msgstr ""
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "OK"
+msgstr "确定"
+
+msgid "Select All"
+msgstr "全选"
+
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+msgid "Clear All"
+msgstr "清除所有"
+
+msgid "Unmark all titles"
+msgstr ""
+
+msgid "Destination files OK. No duplicates detected."
+msgstr ""
+
+msgid "Select this title for adding to the queue.\n"
+msgstr ""
+
+msgid "Preferences"
+msgstr "首选项"
+
+msgid "Automatically check for updates"
+msgstr "自动检查更新"
+
+msgid "When all encodes are complete"
+msgstr "当所有编码完成后"
+
+msgid "Use automatic naming (uses modified source name)"
+msgstr "使用自动命名（使用修改后的源名称）"
+
+msgid "Auto-Name Template"
+msgstr "自动命名模板"
+
+msgid "Available Options: {source} {title} {chapters} {date} {time} {quality} {bitrate}"
+msgstr "可用选项: {source} {title} {chapters} {date} {time} {quality} {bitrate}"
+
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+
+msgid "Number of previews"
+msgstr "预览数"
+
+msgid "Filter short titles (seconds)"
+msgstr ""
+
+msgid "Show system tray icon"
+msgstr "显示系统托盘图标"
+
+msgid "General"
+msgstr "普通"
+
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "使用 dvdnav（代替 libdvdread）"
+
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+
+msgid "Activity Log Verbosity Level"
+msgstr ""
+
+msgid "Activity Log Longevity"
+msgstr ""
+
+msgid "Scale down High Definition previews"
+msgstr ""
+
+msgid "Automatically Scan DVD when loaded"
+msgstr "DVD 装载时自动扫描"
+
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "当有新碟装载时扫描 DVD"
+
+msgid "Hide Advanced Video Options Tab"
+msgstr "隐藏高级视频选项标签"
+
+msgid ""
+"Use advanced video options at your own risk.\n"
+"We recommend that you use the controls available\n"
+"on the Video tab instead."
+msgstr ""
+
+msgid "Delete completed jobs from queue"
+msgstr "删除队列中已完成的作业"
+
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+msgid "Allow Tweaks"
+msgstr "允许 Tweaks"
+
+msgid "Allow HandBrake For Dummies"
+msgstr ""
+
+msgid "Advanced"
+msgstr "高级"
+
+msgid "Folder Name:"
+msgstr "文件夹名称:"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Preset Name:"
+msgstr "预设名称："
+
+msgid "Custom Picture Dimensions"
+msgstr "自定义图像尺寸"
+
+msgid "Maximum Width:"
+msgstr "最大宽度："
+
+msgid "Enable maximum width limit."
+msgstr "启用最大宽度限制."
+
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+msgid "Maximum Height:"
+msgstr "最大高度："
+
+msgid "Enable maximum height limit."
+msgstr ""
+
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+msgid "Select preview frames."
+msgstr "选择预览画面。"
+
+msgid "Encode and play a short sequence of video starting from the current preview position."
+msgstr ""
+
+msgid "Duration:"
+msgstr "持续时间:"
+
+msgid "Set the duration of the live preview in seconds."
+msgstr "以秒为单位设置实时预览时间。"
+
+msgid "Show Crop"
+msgstr "显示裁剪"
+
+msgid "Show Cropped area of the preview"
+msgstr "显示预览中被裁剪部分"
+
+msgid "Fullscreen"
+msgstr "全屏"
+
+msgid "View Fullscreen Preview"
+msgstr "查看全屏预览"
+
+msgid "Title Number:"
+msgstr "标题编号:"
+
+msgid "Detected DVD devices:"
+msgstr "侦测到 DVD 设备："
+
+msgid "Setting:"
+msgstr "设置："
+
+msgid "Import SRT"
+msgstr "导入 SRT"
+
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+
+msgid "Embedded Subtitle List"
+msgstr "内嵌字幕列表"
+
+msgid "Enable settings to select embedded subtitles"
+msgstr "允许设置选择的内嵌字幕"
+
+msgid "Character Code"
+msgstr "字符编码"
+
+msgid "Offset (ms)"
+msgstr "延迟(毫秒）"
+
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+msgid "Select the SRT file to import."
+msgstr "选择要导入的 SRT 文件。"
+
+msgid "Srt File"
+msgstr "Srt 文件"
+
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+
+msgid "Track"
+msgstr "字幕轨"
+
+msgid "List of subtitle tracks available from your source."
+msgstr "您的源文件内所有可用的字幕轨列表。"
+
+msgid "Forced Subtitles Only"
+msgstr ""
+
+msgid "Burn into video"
+msgstr "烧录进视频"
+
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+"在视频中显示该字幕。\n"
+"字幕将作为视频的一部分，并且不能被禁用。"
+
+msgid "Set Default Track"
+msgstr "设置默认轨"
+
+msgid "Source Track"
+msgstr "源音轨"
+
+msgid "List of audio tracks available from your source."
+msgstr "您的源文件内可用的音频轨列表。"
+
+msgid "Track Name:"
+msgstr "音轨名称："
+
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+msgid "Mix"
+msgstr ""
+
+msgid "Sample Rate"
+msgstr "采样率"
+
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
+"\n"
+"For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
+"DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
+msgstr ""
+
+msgid "Enable bitrate setting"
+msgstr "启用码率设置"
+
+msgid "Enable quality setting"
+msgstr "启用质量设置"
+
+msgid "Quality: For output codec's that support it, adjust the quality of the output."
+msgstr ""
+
+msgid "00.0"
+msgstr "00.0"
+
+msgid "Audio Gain: Adjust the amplification or attenuation of the output audio track."
+msgstr ""
+
+msgid "Skip This Version"
+msgstr "跳过此版本"
+
+msgid "Remind Me Later"
+msgstr "稍后提醒我"
+
+msgid "A new version of HandBrake is available!"
+msgstr "有新版本的 HandBrake 可用!"
+
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "HandBrake xxx 现在可用 (您拥有 yyy)。"
+
+msgid "Release Notes"
+msgstr "发行说明"
+
+msgid "Burn-In Behavior*:"
+msgstr ""
+
+msgid "Burn-In for deficient players*:"
+msgstr ""
+
+msgid "_Cancel"
+msgstr ""
+
+msgid "_Open"
+msgstr ""
+
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+msgid "Chapters:"
+msgstr "章节:"
+
+msgid "Seconds:"
+msgstr "秒:"
+
+msgid "Frames:"
+msgstr "帧："
+
+msgid "Do Nothing"
+msgstr "啥都不干"
+
+msgid "Show Notification"
+msgstr "显示通知"
+
+msgid "Quit Handbrake"
+msgstr "退出 Handbrake"
+
+msgid "Put Computer To Sleep"
+msgstr "计算机转入休眠"
+
+msgid "Shutdown Computer"
+msgstr "关闭计算机"
+
+msgid "Week"
+msgstr "星期"
+
+msgid "Month"
+msgstr "月"
+
+msgid "Year"
+msgstr "年"
+
+msgid "Immortal"
+msgstr ""
+
+msgid "Never"
+msgstr "从不"
+
+msgid "Daily"
+msgstr "每天"
+
+msgid "Weekly"
+msgstr "每周"
+
+msgid "Monthly"
+msgstr "每月"
+
+msgid "Default"
+msgstr "默认"
+
+msgid "Fast"
+msgstr "快速"
+
+msgid "Slow"
+msgstr "慢"
+
+msgid "Slower"
+msgstr "较慢"
+
+msgid "Ultralight"
+msgstr ""
+
+msgid "Light"
+msgstr ""
+
+msgid "Medium"
+msgstr ""
+
+msgid "Strong"
+msgstr ""
+
+msgid "Film"
+msgstr "电影"
+
+msgid "Grain"
+msgstr ""
+
+msgid "High Motion"
+msgstr ""
+
+msgid "Animation"
+msgstr "动画"
+
+msgid "Spatial"
+msgstr ""
+
+msgid "Temporal"
+msgstr ""
+
+msgid "Automatic"
+msgstr "自动"
+
+msgid "Optimal"
+msgstr "最佳"
+
+msgid "Normal"
+msgstr "正常"
+
+msgid "Simple"
+msgstr "简单"
+
+msgid "Smart"
+msgstr ""
+
+msgid "Diamond"
+msgstr ""
+
+msgid "Hexagon"
+msgstr ""
+
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+msgid "Exhaustive"
+msgstr ""
+
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+msgid "Most"
+msgstr "大多数"
+
+msgid "Some"
+msgstr "一些"
+
+msgid "All"
+msgstr "所有"
+
+msgid "Encode only"
+msgstr "仅支持编码"
+
+msgid "Always"
+msgstr "总是"
+
+msgid "(NTSC Film)"
+msgstr "(NTSC 电影)"
+
+msgid "(PAL Film/Video)"
+msgstr "(PAL 电影/视频）"
+
+msgid "(NTSC Video)"
+msgstr "(NTSC 视频)"
+
+msgid "%d - %02dh%02dm%02ds - %s"
+msgstr "%d - %02dh%02dm%02ds - %s"
+
+msgid "%d (%05d.MPLS) - %02dh%02dm%02ds"
+msgstr "%d (%05d.MPLS) - %02dh%02dm%02ds"
+
+msgid "%d (%05d.MPLS) - Unknown Length"
+msgstr "%d (%05d.MPLS) - Unknown Length"
+
+msgid "%d - %02dh%02dm%02ds"
+msgstr "%d - %02dh%02dm%02ds"
+
+msgid "%d - Unknown Length"
+msgstr ""
+
+msgid "No Titles"
+msgstr "无标题"
+
+msgid "No Audio"
+msgstr "无音频"
+
+msgid "Foreign Audio Search"
+msgstr ""
+
+#, c-format
+msgid "Chapter %2d"
+msgstr "章节 %2d"
+
+#, c-format
+msgid "N/A"
+msgstr "N/A"
+
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invalid Decomb Settings:\n"
+"\n"
+"%s\n"
+msgstr ""
+"错误的 Decomb 设置:\n"
+"\n"
+"%s\n"
+
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+msgid "Continue"
+msgstr "继续"
+
+msgid "No title found.\n"
+msgstr ""
+
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+msgid ""
+"Srt file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"The source audio does not support %s mixdown.\n"
+"\n"
+"You should choose a different mixdown.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+msgid "Index"
+msgstr "序号"
+
+msgid "Duration"
+msgstr "持续时长"
+
+msgid "Title"
+msgstr "标题"
+
+msgid "Job Information"
+msgstr "作业信息"
+
+msgid "Track Information"
+msgstr "轨信息"
+
+msgid "Preset Name"
+msgstr "预设名称"
+
+msgid "The device or file to encode"
+msgstr ""
+
+msgid "The preset values to use for encoding"
+msgstr "用于编码的预设值"
+
+msgid "Spam a lot"
+msgstr ""
+
+msgid "- Transcode media formats"
+msgstr "- 转码的媒体格式"
+
+msgid "Globals"
+msgstr "全局"
+
+msgid "Presets"
+msgstr "预设值"
+
+msgid "Folder"
+msgstr "文件夹"
+
+#, c-format
+msgid "%s path: (%s)"
+msgstr "%s 路径: (%s)"
+
+#, c-format
+msgid "%s indices: len %d"
+msgstr ""
+
+msgid "Type"
+msgstr "类型"
+
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+msgid "Failed to find parent folder while adding child."
+msgstr ""
+
+#, c-format
+msgid "Can't map language value: (%s)"
+msgstr "不能映射语言值: (%s)"
+
+#, c-format
+msgid "Can't map value: (%s)"
+msgstr "不能映射值: (%s)"
+
+msgid "Subtitles"
+msgstr "字幕"
+
+msgid ""
+"%s: Folder already exists.\n"
+"You can not replace it with a preset."
+msgstr ""
+
+msgid ""
+"%s: Preset already exists.\n"
+"You can not replace it with a folder."
+msgstr ""
+
+msgid "Import Preset"
+msgstr "导入预设"
+
+msgid "All (*)"
+msgstr "所有 (*)"
+
+msgid "Presets (*.plist)"
+msgstr "预设(*.plist)"
+
+msgid "Export Preset"
+msgstr "导出预设"
+
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+"确认删除 %s:\n"
+"\n"
+"%s"
+
+msgid "folder"
+msgstr "文件夹"
+
+msgid "preset"
+msgstr "预设"
+
+msgid "No selection??? Perhaps unselected."
+msgstr "无选择??? 也许是不选。"
+
+#, c-format
+msgid "Gstreamer Error: %s"
+msgstr "Gstreamer 出错: %s"
+
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "Done"
+msgstr "完成"
+
+msgid "Windowed"
+msgstr "窗口"
+
+msgid "Seconds"
+msgstr "秒"
+
+msgid "Frames"
+msgstr "帧"
+
+#, c-format
+msgid "<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) --> %s"
+msgstr ""
+
+#, c-format
+msgid "<big>%s</big> (Title %d, %s %d through %d) --> %s"
+msgstr ""
+
+#, c-format
+msgid "Modified Preset Based On: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Preset: %s\n"
+msgstr ""
+
+#, c-format
+msgid "Format: %s Container\n"
+msgstr ""
+
+msgid "Container Options:"
+msgstr ""
+
+#, c-format
+msgid "%sChapter Markers"
+msgstr "%s章节标记"
+
+#, c-format
+msgid "%siPod 5G Support"
+msgstr "%siPod 5G 支持"
+
+#, c-format
+msgid "%sWeb Optimized"
+msgstr "%s网站优化"
+
+#, c-format
+msgid "%sLarge File Size (>4GB)"
+msgstr "%s大文件 (>4GB)"
+
+#, c-format
+msgid "Destination: %s\n"
+msgstr ""
+
+msgid "(Aspect Preserved)"
+msgstr ""
+
+msgid "(Aspect Lost)"
+msgstr ""
+
+msgid "(Anamorphic)"
+msgstr ""
+
+msgid "(Custom Anamorphic)"
+msgstr ""
+
+msgid "Picture: "
+msgstr ""
+
+#, c-format
+msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgstr ""
+
+#, c-format
+msgid ", Display %d x %d"
+msgstr ", 显示 %d x %d"
+
+msgid "Filters:"
+msgstr ""
+
+#, c-format
+msgid "%sDetelecine"
+msgstr ""
+
+#, c-format
+msgid "%sDecomb"
+msgstr ""
+
+#, c-format
+msgid "%sDeinterlace"
+msgstr ""
+
+#, c-format
+msgid "%sDenoise Filter %s:"
+msgstr ""
+
+#, c-format
+msgid "%sDeblock: %d"
+msgstr ""
+
+#, c-format
+msgid "%sGrayscale"
+msgstr ""
+
+#, c-format
+msgid "Video: %s"
+msgstr "视频: %s"
+
+#, c-format
+msgid ", Framerate: %s %s"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: Peak %s (may be lower)"
+msgstr ""
+
+#, c-format
+msgid ", Framerate: %s (constant frame rate)"
+msgstr ""
+
+msgid "Error"
+msgstr "错误"
+
+msgid "Bitrate:"
+msgstr "码率："
+
+msgid "Bitrate"
+msgstr "码率"
+
+msgid "Quality"
+msgstr "质量"
+
+msgid "Turbo 1st Pass: On\n"
+msgstr ""
+
+#, c-format
+msgid "Video Options: Preset: %s"
+msgstr "视频选项: 预设 %s"
+
+msgid " - Tune: "
+msgstr " - 调整: "
+
+#, c-format
+msgid " - Profile: %s"
+msgstr " - 配置文件: %s"
+
+#, c-format
+msgid " - Level: %s"
+msgstr ""
+
+#, c-format
+msgid "Advanced Options: %s\n"
+msgstr "高级选项: %s\n"
+
+msgid "Audio: "
+msgstr "音频: "
+
+#, c-format
+msgid "Audio Tracks: %d"
+msgstr "音轨: %d"
+
+#, c-format
+msgid "Bitrate: %d"
+msgstr "码率: %d"
+
+#, c-format
+msgid "%s --> Encoder: %s"
+msgstr ""
+
+#, c-format
+msgid "%s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgstr ""
+
+msgid "Subtitle: "
+msgstr "字幕: "
+
+#, c-format
+msgid "Subtitle Tracks: %d\n"
+msgstr "字幕轨道：%d\n"
+
+msgid " (Force)"
+msgstr ""
+
+msgid " (Burn)"
+msgstr ""
+
+msgid " (Default)"
+msgstr " (默认)"
+
+#, c-format
+msgid " %s (%s), %s, Offset (ms) %d%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+msgid "Overwrite"
+msgstr "覆盖"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+"目标: %s\n"
+"\n"
+"这不是一个有效的目录。"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+"目标: %s\n"
+"\n"
+"不能读取或写入该目录。"
+
+#, c-format
+msgid ""
+"Destination filesystem is almost full: %uM free\n"
+"\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+"目标文件系统几乎已满: %uM 空闲\n"
+"\n"
+"如果您继续的话，编码可能不完整。\n"
+
+msgid "Proceed"
+msgstr "继续"
+
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+"目标: %s\n"
+"\n"
+"文件已经存在。\n"
+"您是否想覆盖它?"
+
+msgid ""
+"Duplicate destination files detected.\n"
+"Duplicates will not be added to the queue."
+msgstr ""
+
+msgid "No Title"
+msgstr "无标题 "
+
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+msgid "Stop"
+msgstr "停止"
+
+msgid "Stop Encoding"
+msgstr "停止编码"
+
+msgid "Resume"
+msgstr "继续"
+
+msgid "Resume Encoding"
+msgstr "继续编码"
+
+msgid "S_top Queue"
+msgstr "停止队列(_T)"
+
+msgid "_Start Queue"
+msgstr "开始队列(_S)"
+
+msgid "_Resume Queue"
+msgstr "继续队列(_R)"
+
+msgid "Resume Queue"
+msgstr "继续队列"
+
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have %d unfinished job(s) in a saved queue.\n"
+"\n"
+"Would you like to reload them?"
+msgstr ""
+
+msgid "No"
+msgstr "不"
+
+msgid "Yes"
+msgstr "是"
+
+#, c-format
+msgid "Usage: %s infile [outfile]\n"
+msgstr "使用: %s 内部文件 [外部文件]\n"
+
+#, c-format
+msgid "Offset: %dms"
+msgstr "偏移: %dms"
+
+msgid "Burned Into Video"
+msgstr "刻录到视频"
+
+msgid "Passthrough"
+msgstr "通过"
+
+msgid "through"
+msgstr "直到"
+
+msgid "(Forced Subtitles Only)"
+msgstr ""
+
+msgid "(Default)"
+msgstr "（默认)"
+
+msgid "Error!"
+msgstr "错误！"
+
+#, c-format
+msgid "Preferred Language: %s"
+msgstr "首选语言: %s"
+
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr "添加 %s 如果默认音频是不是字幕轨道 %s"
+
+#, c-format
+msgid "Type %s"
+msgstr "类型 %s"
+
+#, c-format
+msgid "Type %s value %s"
+msgstr "存在 %s 的值 %s"
+
+#, c-format
+msgid "Type %s value %d"
+msgstr "类型 %s 的值 %d"
+
+#, c-format
+msgid "Type %s value %<PRId64>"
+msgstr "类型 %s 的值 %<PRId64>"
+
+#, c-format
+msgid "Type %s value %f"
+msgstr "类型 %s 的值 %f"
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+"%s\n"
+"扩展选项::\n"
+"\"%s\""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+"%s\n"
+"\n"
+"扩展选项::\n"
+"\"\""
+
+msgid "Any"
+msgstr "任何"
+
+msgid "0: SAD, no subpel"
+msgstr ""
+
+msgid "4: SATD, qpel on all"
+msgstr ""
+
+msgid "5: SATD, multi-qpel on all"
+msgstr ""
+
+msgid "6: RD in I/P-frames"
+msgstr ""
+
+msgid "7: RD in all frames"
+msgstr ""
+
+msgid "8: RD refine in I/P-frames"
+msgstr ""
+
+msgid "9: RD refine in all frames"
+msgstr ""
+
+msgid "10: QPRD in all frames"
+msgstr ""
+
+msgid "11: No early terminations in analysis"
+msgstr ""
+
+msgid "Your names"
+msgstr "您的名称"
+
+msgid "Your emails"
+msgstr "您的邮箱"

HandBrake-0.10.2.tar.bz2/gtk/src/appcast.c -> HandBrake-0.10.5.tar.bz2/gtk/src/appcast.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/appcast.h -> HandBrake-0.10.5.tar.bz2/gtk/src/appcast.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * appcast.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * appcast.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * appcast.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with main.c. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_GHB_APPCAST_H_)
 #define _GHB_APPCAST_H_

HandBrake-0.10.2.tar.bz2/gtk/src/audiohandler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/audiohandler.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/audiohandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/audiohandler.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/callbacks.c -> HandBrake-0.10.5.tar.bz2/gtk/src/callbacks.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/callbacks.h -> HandBrake-0.10.5.tar.bz2/gtk/src/callbacks.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/composite_example.c -> HandBrake-0.10.5.tar.bz2/gtk/src/composite_example.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/create_resources.c -> HandBrake-0.10.5.tar.bz2/gtk/src/create_resources.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/ghb-dvd.c -> HandBrake-0.10.5.tar.bz2/gtk/src/ghb-dvd.c Changed

@@ -1,40 +1,24 @@
-/***************************************************************************
- * ghb-dvd.c
- *
- * Sat Apr 19 11:12:53 2008
- * Copyright 2008-2015 John Stebbins
- * <john at stebbins dot name>
- ****************************************************************************/
-
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ghb-dvd.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * ghb-dvd.c is free software.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
- */
-
-// Well, I waisted a bit of time on this. It seems libhb has a function for
-// this that I hadn't discovered yet. hb_dvd_name().
-
-// I borrowed most of this from the udev utility vol_id
-// Here is the authors copyright.
-/*
- * volume_id - reads filesystem label and uuid
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
 *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * ghb-dvd.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #if defined(_WIN32)

HandBrake-0.10.2.tar.bz2/gtk/src/ghb-dvd.h -> HandBrake-0.10.5.tar.bz2/gtk/src/ghb-dvd.h Changed

@@ -1,17 +1,24 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ghb-dvd.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * ghb-dvd.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghb-dvd.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #if !defined(_GHB_DVD_H_)

HandBrake-0.10.2.tar.bz2/gtk/src/ghb.ui -> HandBrake-0.10.5.tar.bz2/gtk/src/ghb.ui Changed

@@ -346,8 +346,8 @@
 <property name="skip_pager_hint">True</property>
 <property name="program_name">HandBrake</property>
 <property name="version">0.9.2</property>
- <property name="copyright" translatable="yes">Copyright © 2008 - 2015 John Stebbins
-Copyright © 2004 - 2015, HandBrake Devs</property>
+ <property name="copyright" translatable="yes">Copyright © 2008 - 2016 John Stebbins
+Copyright © 2004 - 2016, HandBrake Devs</property>
 <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property>
 <property name="website">http://handbrake.fr</property>
 <property name="website_label" translatable="yes">http://handbrake.fr</property>
@@ -1562,7 +1562,6 @@
 <property name="shadow_type">none</property>
 <property name="margin-right">6</property>
 <property name="margin-bottom">6</property>
- <signal name="size-allocate" handler="presets_frame_size_allocate_cb" swapped="no"/>
 <child>
 <object class="GtkScrolledWindow" id="presets_scroll">
 <property name="visible">True</property>

HandBrake-0.10.2.tar.bz2/gtk/src/ghbcellrenderertext.c -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcellrenderertext.c Changed

@@ -1,20 +1,25 @@
-/* gtkcellrenderertext.c
- * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gtkcellrenderertext.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * ghbcellrenderer.c is free software.
 *
- * This library is distributed in the hope that it will be useful,
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcellrenderer.c is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #include <config.h>

HandBrake-0.10.2.tar.bz2/gtk/src/ghbcellrenderertext.h -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcellrenderertext.h Changed

@@ -16,6 +16,28 @@
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
+/*
+ * ghbcellrenderertext.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * callbacks.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcellrenderertext.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
 
 #ifndef __GHB_CELL_RENDERER_TEXT_H__
 #define __GHB_CELL_RENDERER_TEXT_H__

HandBrake-0.10.2.tar.bz2/gtk/src/ghbcompat.h -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcompat.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/ghbcompositor.c -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcompositor.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/ghbcompositor.h -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcompositor.h Changed

@@ -24,6 +24,30 @@
 * files for a list of changes. These files are distributed with
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */
+
+/*
+ * ghbcompositor.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * ghbcompositor.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcompositor.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef __GHB_COMPOSITOR_H__
 #define __GHB_COMPOSITOR_H__

HandBrake-0.10.2.tar.bz2/gtk/src/hb-backend.c -> HandBrake-0.10.5.tar.bz2/gtk/src/hb-backend.c Changed

@@ -1,26 +1,26 @@
-/***************************************************************************
- * hb-backend.c
- *
- * Fri Mar 28 10:38:44 2008
- * Copyright 2008-2015 John Stebbins
- * <john at stebbins dot name>
- ****************************************************************************/
-
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * hb-backend.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * hb-backend.c is free software.
 *
- * This program is distributed in the hope that it will be useful,
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * hb-backend.c is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #define _GNU_SOURCE
 #include <limits.h>
 #include <math.h>

HandBrake-0.10.2.tar.bz2/gtk/src/hb-backend.h -> HandBrake-0.10.5.tar.bz2/gtk/src/hb-backend.h Changed

@@ -1,17 +1,24 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * hb-backend.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * hb-backend.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * hb-backend.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #if !defined(_HBBACKEND_H_)

HandBrake-0.10.2.tar.bz2/gtk/src/icons.c -> HandBrake-0.10.5.tar.bz2/gtk/src/icons.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/icons.h -> HandBrake-0.10.5.tar.bz2/gtk/src/icons.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * icons.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * icons.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * icons.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_GHB_ICONS_H_)
 #define _GHB_ICONS_H_

HandBrake-0.10.2.tar.bz2/gtk/src/ini_to_plist.c -> HandBrake-0.10.5.tar.bz2/gtk/src/ini_to_plist.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/main.c -> HandBrake-0.10.5.tar.bz2/gtk/src/main.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/marshalers.c -> HandBrake-0.10.5.tar.bz2/gtk/src/marshalers.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/marshalers.h -> HandBrake-0.10.5.tar.bz2/gtk/src/marshalers.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/plist.c -> HandBrake-0.10.5.tar.bz2/gtk/src/plist.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/plist.h -> HandBrake-0.10.5.tar.bz2/gtk/src/plist.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/presets.c -> HandBrake-0.10.5.tar.bz2/gtk/src/presets.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * presets.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
 * presets.c is free software.
 *
@@ -10,6 +10,16 @@
 * Foundation; either version 2 of the License, or (at your option)
 * any later version.
 *
+ * presets.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1082,6 +1092,8 @@
 if (gtk_tree_model_get_iter_first(store, &iter))
 gtk_tree_selection_select_iter (selection, &iter);
 }
+ // Make the selection visible in scroll window if it is not.
+ gtk_tree_view_scroll_to_cell(treeview, path, NULL, FALSE, 0, 0);
 gtk_tree_path_free(path);
 }
 }
@@ -4252,26 +4264,6 @@
 }
 
 G_MODULE_EXPORT void
-presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
-{
- GtkTreeView *treeview;
- GtkTreeSelection *selection;
- GtkTreeModel *store;
- GtkTreeIter iter;
-
- treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
- selection = gtk_tree_view_get_selection(treeview);
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
- {
- GtkTreePath *path;
- path = gtk_tree_model_get_path (store, &iter);
- // Make the parent visible in scroll window if it is not.
- gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
- gtk_tree_path_free(path);
- }
-}
-
-G_MODULE_EXPORT void
 presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
 GValue *preset;

HandBrake-0.10.2.tar.bz2/gtk/src/presets.h -> HandBrake-0.10.5.tar.bz2/gtk/src/presets.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * presets.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * presets.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * presets.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_GHB_PRESETS_H_)
 #define _GHB_PRESETS_H_

HandBrake-0.10.2.tar.bz2/gtk/src/preview.c -> HandBrake-0.10.5.tar.bz2/gtk/src/preview.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/preview.h -> HandBrake-0.10.5.tar.bz2/gtk/src/preview.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * preview.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * preview.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * preview.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_GHB_PREVIEW_H_)
 #define _GHB_PREVIEW_H_

HandBrake-0.10.2.tar.bz2/gtk/src/queuehandler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/queuehandler.c Changed

@@ -1,14 +1,25 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * callbacks.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * queuehandler.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * callbacks.c is free software.
+ * queuehandler.c is free software.
 *
 * You may redistribute it and/or modify it under the terms of the
 * GNU General Public License, as published by the Free Software
 * Foundation; either version 2 of the License, or (at your option)
 * any later version.
+ *
+ * queuehandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #include "ghbcompat.h"
@@ -1608,6 +1619,12 @@
 GtkTreeSelection *select;
 GtkWidget *widget;
 
+ int height;
+
+ height = gtk_widget_get_allocated_height(GTK_WIDGET(tv));
+ if (y <= 6 || y >= height - 6)
+ return FALSE;
+
 widget = gtk_drag_get_source_widget(ctx);
 if (widget == NULL || widget != GTK_WIDGET(tv))
 return TRUE;

HandBrake-0.10.2.tar.bz2/gtk/src/queuehandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/queuehandler.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/quotestring.c -> HandBrake-0.10.5.tar.bz2/gtk/src/quotestring.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/renderer_button.c -> HandBrake-0.10.5.tar.bz2/gtk/src/renderer_button.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/renderer_button.h -> HandBrake-0.10.5.tar.bz2/gtk/src/renderer_button.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/resources.c -> HandBrake-0.10.5.tar.bz2/gtk/src/resources.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/resources.h -> HandBrake-0.10.5.tar.bz2/gtk/src/resources.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * resources.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * resources.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * resources.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_RESOURCES_H_)
 #define _RESOURCES_H_

HandBrake-0.10.2.tar.bz2/gtk/src/settings.c -> HandBrake-0.10.5.tar.bz2/gtk/src/settings.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/settings.h -> HandBrake-0.10.5.tar.bz2/gtk/src/settings.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * settings.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * settings.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * settings.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_SETTINGS_H_)
 #define _SETTINGS_H_

HandBrake-0.10.2.tar.bz2/gtk/src/subtitlehandler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/subtitlehandler.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * subtitlehandler.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
 * subtitlehandler.c is free software.
 *
@@ -9,6 +9,17 @@
 * GNU General Public License, as published by the Free Software
 * Foundation; either version 2 of the License, or (at your option)
 * any later version.
+ *
+ * subtitlehandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #include <glib/gi18n.h>
@@ -513,7 +524,7 @@
 // is foreign language.
 foreign_audio_search = FALSE;
 track = ghb_find_subtitle_track(title, pref_lang, 0);
- if (track > 0)
+ if (track >= 0)
 {
 used[track] = TRUE;
 subtitle_add_track(ud, settings, title, track, mux->format,

HandBrake-0.10.2.tar.bz2/gtk/src/subtitlehandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/subtitlehandler.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/values.c -> HandBrake-0.10.5.tar.bz2/gtk/src/values.c Changed

@@ -1,15 +1,25 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * presets.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * values.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * presets.c is free software.
+ * values.c is free software.
 *
 * You may redistribute it and/or modify it under the terms of the
 * GNU General Public License, as published by the Free Software
 * Foundation; either version 2 of the License, or (at your option)
 * any later version.
 *
+ * values.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #include <glib.h>

HandBrake-0.10.2.tar.bz2/gtk/src/values.h -> HandBrake-0.10.5.tar.bz2/gtk/src/values.h Changed

@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * values.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * This program is distributed in the hope that it will be useful,
+ * values.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * values.h is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA
+ * along with callbacks.h. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
+
 #if !defined(_GHB_VALUES_H_)
 #define _GHB_VALUES_H_

HandBrake-0.10.2.tar.bz2/gtk/src/videohandler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/videohandler.c Changed

@@ -1,14 +1,25 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * callbacks.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * videohandler.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
 *
- * callbacks.c is free software.
+ * videohandler.c is free software.
 *
 * You may redistribute it and/or modify it under the terms of the
 * GNU General Public License, as published by the Free Software
 * Foundation; either version 2 of the License, or (at your option)
 * any later version.
+ *
+ * videohandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c. If not, write to:
+ * The Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
 */
 
 #include <glib/gi18n.h>

HandBrake-0.10.2.tar.bz2/gtk/src/videohandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/videohandler.h Changed

HandBrake-0.10.2.tar.bz2/gtk/src/x264handler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/x264handler.c Changed

HandBrake-0.10.2.tar.bz2/gtk/src/x264handler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/x264handler.h Changed

HandBrake-0.10.2.tar.bz2/libhb/audio_remap.c -> HandBrake-0.10.5.tar.bz2/libhb/audio_remap.c Changed

HandBrake-0.10.2.tar.bz2/libhb/audio_remap.h -> HandBrake-0.10.5.tar.bz2/libhb/audio_remap.h Changed

HandBrake-0.10.2.tar.bz2/libhb/audio_resample.c -> HandBrake-0.10.5.tar.bz2/libhb/audio_resample.c Changed

HandBrake-0.10.2.tar.bz2/libhb/audio_resample.h -> HandBrake-0.10.5.tar.bz2/libhb/audio_resample.h Changed

HandBrake-0.10.2.tar.bz2/libhb/batch.c -> HandBrake-0.10.5.tar.bz2/libhb/batch.c Changed

HandBrake-0.10.2.tar.bz2/libhb/bd.c -> HandBrake-0.10.5.tar.bz2/libhb/bd.c Changed

HandBrake-0.10.2.tar.bz2/libhb/bits.h -> HandBrake-0.10.5.tar.bz2/libhb/bits.h Changed

HandBrake-0.10.2.tar.bz2/libhb/colormap.c -> HandBrake-0.10.5.tar.bz2/libhb/colormap.c Changed

HandBrake-0.10.2.tar.bz2/libhb/colormap.h -> HandBrake-0.10.5.tar.bz2/libhb/colormap.h Changed

HandBrake-0.10.2.tar.bz2/libhb/common.c -> HandBrake-0.10.5.tar.bz2/libhb/common.c Changed

HandBrake-0.10.2.tar.bz2/libhb/common.h -> HandBrake-0.10.5.tar.bz2/libhb/common.h Changed

HandBrake-0.10.2.tar.bz2/libhb/cropscale.c -> HandBrake-0.10.5.tar.bz2/libhb/cropscale.c Changed

HandBrake-0.10.2.tar.bz2/libhb/deblock.c -> HandBrake-0.10.5.tar.bz2/libhb/deblock.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decavcodec.c -> HandBrake-0.10.5.tar.bz2/libhb/decavcodec.c Changed

@@ -1,6 +1,6 @@
 /* decavcodec.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -537,6 +537,14 @@
 hb_work_private_t * pv = w->private_data;
 hb_buffer_t * in = *buf_in;
 
+ // libavcodec/mpeg12dec.c requires buffers to be zero padded.
+ // If not zero padded, it can get stuck in an infinite loop.
+ // It's likely there are other decoders that expect the same.
+ if (in->data != NULL)
+ {
+ memset(in->data + in->size, 0, in->alloc - in->size);
+ }
+
 if ( in->size <= 0 )
 {
 /* EOF on input stream - send it downstream & say that we're done */
@@ -1810,6 +1818,14 @@
 *buf_in = NULL;
 *buf_out = NULL;
 
+ // libavcodec/mpeg12dec.c requires buffers to be zero padded.
+ // If not zero padded, it can get stuck in an infinite loop.
+ // It's likely there are other decoders that expect the same.
+ if (in->data != NULL)
+ {
+ memset(in->data + in->size, 0, in->alloc - in->size);
+ }
+
 /* if we got an empty buffer signaling end-of-stream send it downstream */
 if ( in->size == 0 )
 {

HandBrake-0.10.2.tar.bz2/libhb/deccc608sub.c -> HandBrake-0.10.5.tar.bz2/libhb/deccc608sub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/deccc608sub.h -> HandBrake-0.10.5.tar.bz2/libhb/deccc608sub.h Changed

HandBrake-0.10.2.tar.bz2/libhb/declpcm.c -> HandBrake-0.10.5.tar.bz2/libhb/declpcm.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decomb.c -> HandBrake-0.10.5.tar.bz2/libhb/decomb.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decpgssub.c -> HandBrake-0.10.5.tar.bz2/libhb/decpgssub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decsrtsub.c -> HandBrake-0.10.5.tar.bz2/libhb/decsrtsub.c Changed

@@ -1,6 +1,6 @@
 /* decsrtsub.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -475,7 +475,6 @@
 {
 long length;
 char *p, *q;
- int line = 1;
 uint64_t start_time = ( pv->current_entry.start +
 pv->subtitle->config.offset ) * 90;
 uint64_t stop_time = ( pv->current_entry.stop +
@@ -494,7 +493,7 @@
 
 for (q = p = pv->current_entry.text; *p != '\0'; p++)
 {
- if (*p == '\n' || *p == '\r')
+ if (*p == '\r')
 {
 if (*(p + 1) == '\n' || *(p + 1) == '\r' ||
 *(p + 1) == '\0')
@@ -503,18 +502,8 @@
 length--;
 continue;
 }
- else if (line == 1)
- {
- // replace '\r' with '\n'
- *q = '\n';
- line = 2;
- }
- else
- {
- // all subtitles on two lines tops
- // replace line breaks with spaces
- *q = ' ';
- }
+ // replace '\r' with '\n'
+ *q = '\n';
 q++;
 }
 else
@@ -552,7 +541,6 @@
 {
 long length;
 char *p, *q;
- int line = 1;
 uint64_t start_time = ( pv->current_entry.start +
 pv->subtitle->config.offset ) * 90;
 uint64_t stop_time = ( pv->current_entry.stop +
@@ -569,7 +557,7 @@
 
 for (q = p = pv->current_entry.text; *p != '\0'; p++)
 {
- if (*p == '\n' || *p == '\r')
+ if (*p == '\r')
 {
 if (*(p + 1) == '\n' || *(p + 1) == '\r' || *(p + 1) == '\0')
 {
@@ -577,18 +565,8 @@
 length--;
 continue;
 }
- else if (line == 1)
- {
- // replace '\r' with '\n'
- *q = '\n';
- line = 2;
- }
- else
- {
- // all subtitles on two lines tops
- // replace line breaks with spaces
- *q = ' ';
- }
+ // replace '\r' with '\n'
+ *q = '\n';
 q++;
 }
 else

HandBrake-0.10.2.tar.bz2/libhb/decsrtsub.h -> HandBrake-0.10.5.tar.bz2/libhb/decsrtsub.h Changed

HandBrake-0.10.2.tar.bz2/libhb/decssasub.c -> HandBrake-0.10.5.tar.bz2/libhb/decssasub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decssasub.h -> HandBrake-0.10.5.tar.bz2/libhb/decssasub.h Changed

HandBrake-0.10.2.tar.bz2/libhb/dectx3gsub.c -> HandBrake-0.10.5.tar.bz2/libhb/dectx3gsub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decutf8sub.c -> HandBrake-0.10.5.tar.bz2/libhb/decutf8sub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/decvobsub.c -> HandBrake-0.10.5.tar.bz2/libhb/decvobsub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/deinterlace.c -> HandBrake-0.10.5.tar.bz2/libhb/deinterlace.c Changed

HandBrake-0.10.2.tar.bz2/libhb/demuxmpeg.c -> HandBrake-0.10.5.tar.bz2/libhb/demuxmpeg.c Changed

HandBrake-0.10.2.tar.bz2/libhb/denoise.c -> HandBrake-0.10.5.tar.bz2/libhb/denoise.c Changed

HandBrake-0.10.2.tar.bz2/libhb/detelecine.c -> HandBrake-0.10.5.tar.bz2/libhb/detelecine.c Changed

HandBrake-0.10.2.tar.bz2/libhb/dvd.c -> HandBrake-0.10.5.tar.bz2/libhb/dvd.c Changed

HandBrake-0.10.2.tar.bz2/libhb/dvd.h -> HandBrake-0.10.5.tar.bz2/libhb/dvd.h Changed

HandBrake-0.10.2.tar.bz2/libhb/dvdnav.c -> HandBrake-0.10.5.tar.bz2/libhb/dvdnav.c Changed

HandBrake-0.10.2.tar.bz2/libhb/dxva2api.c -> HandBrake-0.10.5.tar.bz2/libhb/dxva2api.c Changed

HandBrake-0.10.2.tar.bz2/libhb/dxva2api.h -> HandBrake-0.10.5.tar.bz2/libhb/dxva2api.h Changed

HandBrake-0.10.2.tar.bz2/libhb/eedi2.c -> HandBrake-0.10.5.tar.bz2/libhb/eedi2.c Changed

HandBrake-0.10.2.tar.bz2/libhb/eedi2.h -> HandBrake-0.10.5.tar.bz2/libhb/eedi2.h Changed

HandBrake-0.10.2.tar.bz2/libhb/enc_qsv.c -> HandBrake-0.10.5.tar.bz2/libhb/enc_qsv.c Changed

HandBrake-0.10.2.tar.bz2/libhb/encavcodec.c -> HandBrake-0.10.5.tar.bz2/libhb/encavcodec.c Changed

HandBrake-0.10.2.tar.bz2/libhb/encavcodecaudio.c -> HandBrake-0.10.5.tar.bz2/libhb/encavcodecaudio.c Changed

HandBrake-0.10.2.tar.bz2/libhb/enctheora.c -> HandBrake-0.10.5.tar.bz2/libhb/enctheora.c Changed

HandBrake-0.10.2.tar.bz2/libhb/encvobsub.c -> HandBrake-0.10.5.tar.bz2/libhb/encvobsub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/encvorbis.c -> HandBrake-0.10.5.tar.bz2/libhb/encvorbis.c Changed

HandBrake-0.10.2.tar.bz2/libhb/encx264.c -> HandBrake-0.10.5.tar.bz2/libhb/encx264.c Changed

HandBrake-0.10.2.tar.bz2/libhb/encx264.h -> HandBrake-0.10.5.tar.bz2/libhb/encx264.h Changed

HandBrake-0.10.2.tar.bz2/libhb/encx265.c -> HandBrake-0.10.5.tar.bz2/libhb/encx265.c Changed

HandBrake-0.10.2.tar.bz2/libhb/fifo.c -> HandBrake-0.10.5.tar.bz2/libhb/fifo.c Changed

HandBrake-0.10.2.tar.bz2/libhb/h264_common.h -> HandBrake-0.10.5.tar.bz2/libhb/h264_common.h Changed

HandBrake-0.10.2.tar.bz2/libhb/h265_common.h -> HandBrake-0.10.5.tar.bz2/libhb/h265_common.h Changed

HandBrake-0.10.2.tar.bz2/libhb/hb.c -> HandBrake-0.10.5.tar.bz2/libhb/hb.c Changed

@@ -1,6 +1,6 @@
 /* hb.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -222,7 +222,7 @@
 1 << 16 ); // saturation
 
 if (sws_init_context(ctx, NULL, NULL) < 0) {
- fprintf(stderr, "Cannot initialize resampling context\n");
+ hb_error("Cannot initialize resampling context");
 sws_freeContext(ctx);
 ctx = NULL;
 } 
@@ -503,15 +503,68 @@
 return h;
 }
 
+// Make sure these strings at least exist in the executable even though
+// they may not all be visible in the frontend.
+static const char* hb_title = HB_PROJECT_TITLE;
+static const char* hb_name = HB_PROJECT_NAME;
+static const char* hb_website = HB_PROJECT_URL_WEBSITE;
+static const char* hb_community = HB_PROJECT_URL_COMMUNITY;
+static const char* hb_irc = HB_PROJECT_URL_IRC;
+static const char* hb_version = HB_PROJECT_VERSION;
+static const int hb_build = HB_PROJECT_BUILD;
+static const char* hb_repo_url = HB_PROJECT_REPO_URL;
+static const char* hb_repo_tag = HB_PROJECT_REPO_TAG;
+static const int hb_repo_rev = HB_PROJECT_REPO_REV;
+static const char* hb_repo_hash = HB_PROJECT_REPO_HASH;
+static const char* hb_repo_branch = HB_PROJECT_REPO_BRANCH;
+static const char* hb_repo_remote = HB_PROJECT_REPO_REMOTE;
+static const char* hb_repo_type = HB_PROJECT_REPO_TYPE;
+
+const char * hb_get_full_description()
+{
+ static char * desc = NULL;
+ if (desc == NULL)
+ {
+ desc = hb_strdup_printf("%s\n"
+ "\tWebsite: %s\n"
+ "\tForum: %s\n"
+ "\tIRC: %s\n"
+ "\tBuild Type: %s\n"
+ "\tRepository: %s\n"
+ "\tRelease Tag: %s\n"
+ "\tRevision: %d\n"
+ "\tCommit Hash: %s\n"
+ "\tBranch: %s\n"
+ "\tRemote: %s",
+ hb_title, hb_website, hb_community, hb_irc,
+ hb_repo_type, hb_repo_url, hb_repo_tag, hb_repo_rev,
+ hb_repo_hash, hb_repo_branch, hb_repo_remote);
+ }
+ return desc;
+}
 
 /**
 * Returns current version of libhb.
 * @param h Handle to hb_handle_t.
 * @return character array of version number.
 */
-char * hb_get_version( hb_handle_t * h )
+const char * hb_get_version( hb_handle_t * h )
 {
- return HB_PROJECT_VERSION;
+ // Silence compiler warnings for unused variables
+ ((void)(hb_title));
+ ((void)(hb_name));
+ ((void)(hb_website));
+ ((void)(hb_community));
+ ((void)(hb_irc));
+ ((void)(hb_version));
+ ((void)(hb_repo_url));
+ ((void)(hb_repo_tag));
+ ((void)(hb_repo_rev));
+ ((void)(hb_repo_hash));
+ ((void)(hb_repo_branch));
+ ((void)(hb_repo_remote));
+ ((void)(hb_repo_type));
+ return hb_version;
 }
 
 /**
@@ -521,7 +574,7 @@
 */
 int hb_get_build( hb_handle_t * h )
 {
- return HB_PROJECT_BUILD;
+ return hb_build;
 }
 
 /**
@@ -1095,12 +1148,18 @@
 if (maxWidth && (width > maxWidth))
 {
 width = maxWidth;
- height = MULTIPLE_MOD(width / dar, mod);
+ if (keep_display_aspect)
+ {
+ height = MULTIPLE_MOD(width / dar, mod);
+ }
 }
 if (maxHeight && (height > maxHeight))
 {
 height = maxHeight;
- width = MULTIPLE_MOD(height * dar, mod);
+ if (keep_display_aspect)
+ {
+ width = MULTIPLE_MOD(height * dar, mod);
+ }
 }
 dst_par_num = dst_par_den = 1;
 } break;
@@ -1191,7 +1250,8 @@
 // But otherwise, PAR and DAR will change the least
 // if we stay as close as possible to the requested
 // storage aspect.
- if (!keep_display_aspect)
+ if (!keep_display_aspect &&
+ (maxHeight == 0 || height < maxHeight))
 {
 height = width / storage_aspect + 0.5;
 height = MULTIPLE_MOD(height, mod);
@@ -1201,7 +1261,8 @@
 {
 height = maxHeight;
 // Ditto, see comment above
- if (!keep_display_aspect)
+ if (!keep_display_aspect &&
+ (maxWidth == 0 || width < maxWidth))
 {
 width = height * storage_aspect + 0.5;
 width = MULTIPLE_MOD(width, mod);
@@ -1720,7 +1781,6 @@
 hb_register(&hb_encca_aac);
 hb_register(&hb_encca_haac);
 #endif
- hb_register(&hb_enclame);
 hb_register(&hb_enctheora);
 hb_register(&hb_encvorbis);
 hb_register(&hb_encx264);
@@ -1744,6 +1804,9 @@
 char dirname[1024];
 DIR * dir;
 struct dirent * entry;
+
+ /* OpenCL library (dynamically loaded) */
+ hb_ocl_close();
 
 /* Find and remove temp folder */
 memset( dirname, 0, 1024 );

HandBrake-0.10.2.tar.bz2/libhb/hb.h -> HandBrake-0.10.5.tar.bz2/libhb/hb.h Changed

HandBrake-0.10.2.tar.bz2/libhb/hb_dict.c -> HandBrake-0.10.5.tar.bz2/libhb/hb_dict.c Changed

HandBrake-0.10.2.tar.bz2/libhb/hb_dict.h -> HandBrake-0.10.5.tar.bz2/libhb/hb_dict.h Changed

HandBrake-0.10.2.tar.bz2/libhb/hbffmpeg.h -> HandBrake-0.10.5.tar.bz2/libhb/hbffmpeg.h Changed

HandBrake-0.10.2.tar.bz2/libhb/internal.h -> HandBrake-0.10.5.tar.bz2/libhb/internal.h Changed

HandBrake-0.10.2.tar.bz2/libhb/lang.c -> HandBrake-0.10.5.tar.bz2/libhb/lang.c Changed

HandBrake-0.10.2.tar.bz2/libhb/lang.h -> HandBrake-0.10.5.tar.bz2/libhb/lang.h Changed

HandBrake-0.10.2.tar.bz2/libhb/muxavformat.c -> HandBrake-0.10.5.tar.bz2/libhb/muxavformat.c Changed

@@ -1,6 +1,6 @@
 /* muxavformat.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -121,7 +121,7 @@
 hb_mux_data_t * track;
 int meta_mux;
 int max_tracks;
- int ii, ret;
+ int ii, jj, ret;
 
 const char *muxer_name = NULL;
 
@@ -602,6 +602,56 @@
 }
 }
 
+ // Check for audio track associations
+ for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
+ {
+ audio = hb_list_item(job->list_audio, ii);
+ switch (audio->config.out.codec & HB_ACODEC_MASK)
+ {
+ case HB_ACODEC_FFAAC:
+ case HB_ACODEC_CA_AAC:
+ case HB_ACODEC_CA_HAAC:
+ case HB_ACODEC_FDK_AAC:
+ case HB_ACODEC_FDK_HAAC:
+ break;
+
+ default:
+ {
+ // Mark associated fallback audio tracks for any non-aac track
+ for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
+ {
+ hb_audio_t * fallback;
+ int codec;
+
+ if (ii == jj) continue;
+
+ fallback = hb_list_item( job->list_audio, jj );
+ codec = fallback->config.out.codec & HB_ACODEC_MASK;
+ if (fallback->config.in.track == audio->config.in.track &&
+ (codec == HB_ACODEC_FFAAC ||
+ codec == HB_ACODEC_CA_AAC ||
+ codec == HB_ACODEC_CA_HAAC ||
+ codec == HB_ACODEC_FDK_AAC ||
+ codec == HB_ACODEC_FDK_HAAC))
+ {
+ hb_mux_data_t * fallback_track;
+ int * sd;
+
+ track = audio->priv.mux_data;
+ fallback_track = fallback->priv.mux_data;
+ sd = (int*)av_stream_new_side_data(track->st,
+ AV_PKT_DATA_FALLBACK_TRACK,
+ sizeof(int));
+ if (sd != NULL)
+ {
+ *sd = fallback_track->st->index;
+ }
+ }
+ }
+ } break;
+ }
+ }
+
 char * subidx_fmt =
 "size: %dx%d\n"
 "org: %d, %d\n"
@@ -915,7 +965,7 @@
 time_t now = time(NULL);
 struct tm * now_utc = gmtime(&now);
 char now_8601[24];
- strftime(now_8601, sizeof(now_8601), "%FT%TZ", now_utc);
+ strftime(now_8601, sizeof(now_8601), "%Y-%m-%dT%H:%M:%SZ", now_utc);
 av_dict_set(&m->oc->metadata, "creation_time", now_8601, 0);
 
 ret = avformat_write_header(m->oc, &av_opts);

HandBrake-0.10.2.tar.bz2/libhb/muxcommon.c -> HandBrake-0.10.5.tar.bz2/libhb/muxcommon.c Changed

@@ -1,6 +1,6 @@
 /* muxcommon.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -780,7 +780,7 @@
 uint8_t *style_atoms, uint16_t *stylesize)
 {
 uint16_t utf8_count = 0; // utf8 count from start of subtitle
- int consumed, in_pos = 0, out_pos = 0, len, ii, lines;
+ int consumed, in_pos = 0, out_pos = 0, len, ii;
 style_context_t ctx;
 hb_subtitle_style_t style;
 char *text, *tmp;
@@ -803,7 +803,6 @@
 
 while (input[in_pos] != '\0')
 {
- lines = 1;
 text = hb_ssa_to_text((char*)input + in_pos, &consumed, &style);
 if (text == NULL)
 break;
@@ -818,18 +817,6 @@
 hb_deep_log( 3, "mux: Counted %d UTF-8 chrs within subtitle",
 utf8_count);
 }
- // By default tx3g only supports 2 lines of text
- // To support more lines, we must enable the virtical placement
- // flag in the tx3g atom and add tbox atoms to the sample
- // data to set the vertical placement for each subtitle.
- // Although tbox defines a rectangle, the QT spec says
- // that only the vertical placement is honored (bummer).
- if (text[ii] == '\n')
- {
- lines++;
- if (lines > 2)
- text[ii] = ' ';
- }
 len++;
 }
 strcpy((char*)output+out_pos, text);

HandBrake-0.10.2.tar.bz2/libhb/nal_units.c -> HandBrake-0.10.5.tar.bz2/libhb/nal_units.c Changed

HandBrake-0.10.2.tar.bz2/libhb/nal_units.h -> HandBrake-0.10.5.tar.bz2/libhb/nal_units.h Changed

HandBrake-0.10.2.tar.bz2/libhb/nlmeans.c -> HandBrake-0.10.5.tar.bz2/libhb/nlmeans.c Changed

HandBrake-0.10.2.tar.bz2/libhb/oclnv12toyuv.c -> HandBrake-0.10.5.tar.bz2/libhb/oclnv12toyuv.c Changed

HandBrake-0.10.2.tar.bz2/libhb/oclnv12toyuv.h -> HandBrake-0.10.5.tar.bz2/libhb/oclnv12toyuv.h Changed

HandBrake-0.10.2.tar.bz2/libhb/oclscale.c -> HandBrake-0.10.5.tar.bz2/libhb/oclscale.c Changed

HandBrake-0.10.2.tar.bz2/libhb/opencl.c -> HandBrake-0.10.5.tar.bz2/libhb/opencl.c Changed

HandBrake-0.10.2.tar.bz2/libhb/opencl.h -> HandBrake-0.10.5.tar.bz2/libhb/opencl.h Changed

HandBrake-0.10.2.tar.bz2/libhb/openclkernels.h -> HandBrake-0.10.5.tar.bz2/libhb/openclkernels.h Changed

HandBrake-0.10.2.tar.bz2/libhb/openclwrapper.c -> HandBrake-0.10.5.tar.bz2/libhb/openclwrapper.c Changed

HandBrake-0.10.2.tar.bz2/libhb/openclwrapper.h -> HandBrake-0.10.5.tar.bz2/libhb/openclwrapper.h Changed

HandBrake-0.10.2.tar.bz2/libhb/param.c -> HandBrake-0.10.5.tar.bz2/libhb/param.c Changed

HandBrake-0.10.2.tar.bz2/libhb/ports.c -> HandBrake-0.10.5.tar.bz2/libhb/ports.c Changed

HandBrake-0.10.2.tar.bz2/libhb/ports.h -> HandBrake-0.10.5.tar.bz2/libhb/ports.h Changed

HandBrake-0.10.2.tar.bz2/libhb/project.h.m4 -> HandBrake-0.10.5.tar.bz2/libhb/project.h.m4 Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_common.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_common.c Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_common.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_common.h Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_filter.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter.c Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_filter.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter.h Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_filter_pp.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter_pp.c Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_filter_pp.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter_pp.h Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_memory.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_memory.c Changed

HandBrake-0.10.2.tar.bz2/libhb/qsv_memory.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_memory.h Changed

HandBrake-0.10.2.tar.bz2/libhb/reader.c -> HandBrake-0.10.5.tar.bz2/libhb/reader.c Changed

HandBrake-0.10.2.tar.bz2/libhb/rendersub.c -> HandBrake-0.10.5.tar.bz2/libhb/rendersub.c Changed

HandBrake-0.10.2.tar.bz2/libhb/rotate.c -> HandBrake-0.10.5.tar.bz2/libhb/rotate.c Changed

HandBrake-0.10.2.tar.bz2/libhb/scan.c -> HandBrake-0.10.5.tar.bz2/libhb/scan.c Changed

HandBrake-0.10.2.tar.bz2/libhb/stream.c -> HandBrake-0.10.5.tar.bz2/libhb/stream.c Changed

HandBrake-0.10.2.tar.bz2/libhb/sync.c -> HandBrake-0.10.5.tar.bz2/libhb/sync.c Changed

@@ -1,6 +1,6 @@
 /* sync.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -59,6 +59,7 @@
 int merge;
 hb_buffer_t * list_current;
 hb_buffer_t * last;
+ int64_t last_start;
 } subtitle_sanitizer_t;
 
 typedef struct
@@ -229,6 +230,7 @@
 // Fill in stop time when it is missing
 sync->subtitle_sanitizer[i].link = 1;
 }
+ sync->subtitle_sanitizer[i].last_start = AV_NOPTS_VALUE;
 }
 
 static void CloseSubtitle(hb_sync_video_t * sync, int ii)
@@ -512,7 +514,20 @@
 sanitizer->last = sub;
 }
 }
- return mergeSubtitles(sanitizer, 0);
+
+ hb_buffer_t * out;
+ sub = out = mergeSubtitles(sanitizer, 0);
+ while (sub)
+ {
+ if (sub->s.start < sanitizer->last_start)
+ {
+ sub->s.start = sanitizer->last_start;
+ }
+ sanitizer->last_start = sub->s.start;
+ sub = sub->next;
+ }
+
+ return out;
 }
 
 /***********************************************************************

HandBrake-0.10.2.tar.bz2/libhb/taskset.c -> HandBrake-0.10.5.tar.bz2/libhb/taskset.c Changed

HandBrake-0.10.2.tar.bz2/libhb/taskset.h -> HandBrake-0.10.5.tar.bz2/libhb/taskset.h Changed

HandBrake-0.10.2.tar.bz2/libhb/update.c -> HandBrake-0.10.5.tar.bz2/libhb/update.c Changed

HandBrake-0.10.2.tar.bz2/libhb/vadxva2.c -> HandBrake-0.10.5.tar.bz2/libhb/vadxva2.c Changed

HandBrake-0.10.2.tar.bz2/libhb/vadxva2.h -> HandBrake-0.10.5.tar.bz2/libhb/vadxva2.h Changed

HandBrake-0.10.2.tar.bz2/libhb/vfr.c -> HandBrake-0.10.5.tar.bz2/libhb/vfr.c Changed

HandBrake-0.10.2.tar.bz2/libhb/work.c -> HandBrake-0.10.5.tar.bz2/libhb/work.c Changed

@@ -1,6 +1,6 @@
 /* work.c
 
- Copyright (c) 2003-2015 HandBrake Team
+ Copyright (c) 2003-2016 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -138,8 +138,8 @@
 }
 switch (codec)
 {
- case HB_ACODEC_AC3: return hb_get_work(WORK_ENCAVCODEC_AUDIO);
- case HB_ACODEC_LAME: return hb_get_work(WORK_ENCLAME);
+ case HB_ACODEC_AC3:
+ case HB_ACODEC_LAME: return hb_get_work(WORK_ENCAVCODEC_AUDIO);
 case HB_ACODEC_VORBIS: return hb_get_work(WORK_ENCVORBIS);
 case HB_ACODEC_CA_AAC: return hb_get_work(WORK_ENC_CA_AAC);
 case HB_ACODEC_CA_HAAC: return hb_get_work(WORK_ENC_CA_HAAC);
@@ -564,12 +564,23 @@
 
 job->list_work = hb_list_init();
 
- /* OpenCL */
+ /*
+ * OpenCL
+ *
+ * Note: we delay hb_ocl_init until here, since they're no point it loading
+ * the library if we aren't going to use it. But we only call hb_ocl_close
+ * in hb_global_close, since un/reloading the library each run is wasteful.
+ */
 if (job->use_opencl && (hb_ocl_init() || hb_init_opencl_run_env(0, NULL, "-I.")))
 {
 hb_log("work: failed to initialize OpenCL environment, using fallback");
+ hb_release_opencl_run_env();
 job->use_opencl = 0;
- hb_ocl_close();
+ }
+ else
+ {
+ // we're not (re-)using OpenCL here, we can release the environment
+ hb_release_opencl_run_env();
 }
 
 hb_log( "starting job" );
@@ -802,6 +813,12 @@
 &vpp_settings[2], &vpp_settings[3],
 &vpp_settings[4], &vpp_settings[5]);
 }
+ // VPP crop/scale takes precedence over OpenCL scale too
+ if (job->use_opencl)
+ {
+ hb_release_opencl_run_env();
+ job->use_opencl = 0;
+ }
 hb_list_rem(job->list_filter, filter);
 hb_filter_close(&filter);
 break;
@@ -1652,12 +1669,6 @@
 }
 
 hb_buffer_pool_free();
- 
- /* OpenCL: must be closed *after* freeing the buffer pool */
- if (job->use_opencl)
- {
- hb_ocl_close();
- }
 
 hb_job_close( &job );
 }

HandBrake-0.10.2.tar.bz2/macosx/Controller.m -> HandBrake-0.10.5.tar.bz2/macosx/Controller.m Changed

@@ -1848,14 +1848,13 @@
             /* Only show the user this warning once. They may be using a solution we don't know about. Notifying them each time is annoying. */
             [prefs setInteger:1 forKey:@"suppresslibdvdcss"];
             
-            /*compatible vlc not found, so we set the bool to cancel scanning to 1 */
+            /*compatible lib not found, so we set the bool to cancel scanning to 1 */
             cancelScanDecrypt = 1;
             [HBUtilities writeToActivityLog: "libdvdcss.2.dylib not found for decrypting physical dvd"];
             NSInteger status;
             NSAlert *alert = [[NSAlert alloc] init];
-            [alert setMessageText:@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish install libdvdcss or any other 3rd party software for this function."];
-            [alert setInformativeText:@"Videolan.org provides libdvdcss if you are not currently using another solution."];
-            [alert addButtonWithTitle:@"Get libdvdcss.pkg"];
+            [alert setMessageText:@"Copy-Protected sources are not supported."];
+            [alert setInformativeText:@"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish use any other 3rd party software for this function."];
             [alert addButtonWithTitle:@"Cancel Scan"];
             [alert addButtonWithTitle:@"Attempt Scan Anyway"];
             [NSApp requestUserAttention:NSCriticalRequest];
@@ -1864,11 +1863,6 @@
 
             if (status == NSAlertFirstButtonReturn)
             {
-                /* User chose to go download vlc (as they rightfully should) so we send them to the vlc site */
-                [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://download.videolan.org/libdvdcss/1.2.12/macosx/"]];
-            }
-            else if (status == NSAlertSecondButtonReturn)
-            {
                 /* User chose to cancel the scan */
                 [HBUtilities writeToActivityLog: "Cannot open physical dvd, scan cancelled"];
             }

HandBrake-0.10.2.tar.bz2/macosx/HBOutputRedirect.m -> HandBrake-0.10.5.tar.bz2/macosx/HBOutputRedirect.m Changed

HandBrake-0.10.2.tar.bz2/macosx/Info.plist.m4 -> HandBrake-0.10.5.tar.bz2/macosx/Info.plist.m4 Changed

HandBrake-0.10.2.tar.bz2/make/configure.py -> HandBrake-0.10.5.tar.bz2/make/configure.py Changed

@@ -16,6 +16,7 @@
 import subprocess
 import sys
 import time
+from datetime import datetime, timedelta
 
 from optparse import OptionGroup
 from optparse import OptionGroup
@@ -159,12 +160,12 @@
 if os.access( name, os.X_OK ):
 return name
 return None
- 
+
 if not os.environ.has_key( 'PATH' ) or os.environ[ 'PATH' ] == '':
 path = os.defpath
 else:
 path = os.environ['PATH']
- 
+
 for dir in path.split( os.pathsep ):
 f = os.path.join( dir, name )
 if os.access( f, os.X_OK ):
@@ -317,7 +318,7 @@
 ##
 ## returns true if feature successfully compiles
 ##
-## 
+##
 class CCProbe( Action ):
 def __init__( self, pretext, command, test_file ):
 super( CCProbe, self ).__init__( 'probe', pretext )
@@ -358,7 +359,7 @@
 ##
 ## returns true if feature successfully compiles
 ##
-## 
+##
 class LDProbe( Action ):
 def __init__( self, pretext, command, lib, test_file ):
 super( LDProbe, self ).__init__( 'probe', pretext )
@@ -444,7 +445,7 @@
 
 if self.match( '*-*-cygwin*' ):
 self.systemf = self[2][0].upper() + self[2][1:]
- 
+
 ## glob-match against spec
 def match( self, *specs ):
 for spec in specs:
@@ -519,7 +520,7 @@
 
 def __nonzero__( self ):
 return self.value != None
- 
+
 def __str__( self ):
 return self.value
 
@@ -551,7 +552,7 @@
 def _action( self ):
 self.fail = False
 
- ## some match on system should be made here; otherwise we signal a warning. 
+ ## some match on system should be made here; otherwise we signal a warning.
 if host.match( '*-*-cygwin*' ):
 pass
 elif host.match( '*-*-darwin11.*' ):
@@ -673,74 +674,83 @@
 ## Builds are classed into one of the following types:
 ##
 ## release
-## must be built from official svn with '/tags/' in the url
+## must be built from official git at version tag
 ## developer
-## must be built from official svn but is not a release
-## unofficial
-## all other builds
+## must be built from official git but is not a release
 ##
 class RepoProbe( ShellProbe ):
 def __init__( self ):
- svn = 'svn'
-
- ## Possible the repo was created using an incompatible version than what is
- ## available in PATH when probe runs. Workaround by checking for file
- ## .svn/HANDBRAKE_REPO_PROBE which points to a preferred svn executable.
+ # Find script that creates repo info
 try:
- hrp = os.path.join( cfg.src_dir, '.svn', 'HANDBRAKE_REPO_PROBE' )
- if os.path.isfile( hrp ) and os.path.getsize( hrp ) > 0:
- file = cfg.open( hrp, 'r' )
- line = file.readline().strip()
- file.close()
- if line:
- svn = line
+ repo_info = os.path.join( cfg.src_dir, 'scripts', 'repo-info.sh' )
+ if not os.path.isfile( repo_info ):
+ cfg.errln( 'Missing required script %s\n', repo_info )
+ sys.exit( 1 )
 except:
- pass
+ sys.exit( 1 )
 
- super( RepoProbe, self ).__init__( 'svn info', '%s info %s' % (svn,cfg.src_dir) )
+ super( RepoProbe, self ).__init__( 'repo info', '%s %s' %
+ (repo_info, cfg.src_dir) )
 
- self.url = 'svn://nowhere.com/project/unknown'
- self.root = 'svn://nowhere.com/project'
+ self.url = 'git://nowhere.com/project/unknown'
+ self.tag = ''
+ self.tag_hash = 'deadbeaf'
 self.branch = 'unknown'
- self.uuid = '00000000-0000-0000-0000-000000000000';
+ self.remote = 'unknown'
 self.rev = 0
- self.date = '0000-00-00 00:00:00 -0000'
+ self.hash = 'deadbeaf'
+ self.shorthash = 'deadbea'
+ self.date = datetime(1, 1, 1)
 self.official = 0
- self.type = 'unofficial'
+ self.type = 'developer'
 
 def _parseSession( self ):
 for line in self.session:
 ## grok fields
- m = re.match( '([^:]+):\\s+(.+)', line )
+ m = re.match( '([^\=]+)\=(.*)', line )
 if not m:
 continue
 
 (name,value) = m.groups()
- if name == 'URL':
+ if name == 'URL' and value != '':
 self.url = value
- elif name == 'Repository Root':
- self.root = value
- elif name == 'Repository UUID':
- self.uuid = value
- elif name == 'Revision':
+ elif name == 'TAG':
+ self.tag = value
+ elif name == 'TAG_HASH':
+ self.tag_hash = value
+ elif name == 'BRANCH':
+ self.branch = value
+ elif name == 'REMOTE':
+ self.remote = value
+ elif name == 'REV':
 self.rev = int( value )
- elif name == 'Last Changed Date':
- # strip chars in parens
- if value.find( ' (' ):
- self.date = value[0:value.find(' (')]
+ elif name == 'DATE':
+ self.date = datetime.strptime(value[0:19], "%Y-%m-%d %H:%M:%S")
+
+ # strptime can't handle UTC offset
+ m = re.match( '^([-+]?[0-9]{2})([0-9]{2})$', value[20:])
+ (hh, mn) = m.groups()
+ utc_off_hour = int(hh)
+ utc_off_minute = int(mn)
+ if utc_off_hour >= 0:
+ utc_off = utc_off_hour * 60 + utc_off_minute
 else:
- self.date = value
+ utc_off = utc_off_hour * 60 - utc_off_minute
+ delta = timedelta(minutes=utc_off)
+ self.date = self.date - delta
+
+ elif name == 'HASH':
+ self.hash = value
+ self.shorthash = value[:7]
 
- ## grok branch
- i = self.url.rfind( '/' )
- if i != -1 and i < len(self.url)-1:
- self.branch = self.url[i+1:]
+ # type-classification via repository URL
+ official_url = 'https://github.com/HandBrake/HandBrake.git' # HTTPS
+ if self.url == 'git@github.com:HandBrake/HandBrake.git': # SSH
+ self.url = official_url
 
- # type-classification via repository UUID
- if self.uuid == 'b64f7644-9d1e-0410-96f1-a4d463321fa5':
+ if self.url == official_url:
 self.official = 1
- m = re.match( '([^:]+)://([^/]+)/(.+)', self.url )
- if m and re.match( '.*tags/.*', m.group( 3 )):
+ if not options.snapshot and self.hash == self.tag_hash:
 self.type = 'release'
 else:
 self.type = 'developer'
@@ -748,12 +758,12 @@
 self.msg_end = self.url
 
 def _failSession( self ):
- # Look for svn info in version file.
+ # Look for repo info in version file.
 #
 # Version file would be created manually by source packager.
 # e.g.
- # $ svn info HandBrake > HandBrake/version.txt
- # $ tar -czf handbrake-source.tgz --exclude .svn HandBrake
+ # $ HandBrake/scripts/repo-info.sh HandBrake > HandBrake/version.txt
+ # $ tar -czf handbrake-source.tgz --exclude .git HandBrake
 cfg.infof( 'probe: version.txt...' )
 try:
 hvp = os.path.join( cfg.src_dir, 'version.txt' )
@@ -793,8 +803,11 @@
 self.name_upper = self.name.upper()
 
 self.vmajor = 0
- self.vminor = 10
- self.vpoint = 2
+ self.vminor = 0
+ self.vpoint = 0
+ self.spoint = 0
+ self.suffix = ''
+ self.special = ''
 
 def _action( self ):
 ## add architecture to URL only for Mac
@@ -803,24 +816,52 @@
 else:
 url_arch = ''
 
- if repo.type == 'release':
- self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint)
- url_ctype = ''
- url_ntype = 'stable'
- self.build = time.strftime('%Y%m%d') + '00'
- self.title = '%s %s (%s)' % (self.name,self.version,self.build)
- elif repo.type == 'developer':
- self.version = '%dsvn' % (repo.rev)
+ suffix = ''
+ if repo.tag != '':
+ m = re.match( '^([0-9]+)\.([0-9]+)\.([0-9]+)-?(.*)?$', repo.tag )
+ if not m:
+ cfg.errln( 'Invalid repo tag format %s\n', repo.tag )
+ sys.exit( 1 )
+ (vmajor, vminor, vpoint, suffix) = m.groups()
+ self.vmajor = int(vmajor)
+ self.vminor = int(vminor)
+ self.vpoint = int(vpoint)
+ self.suffix = suffix
+
+ if repo.type != 'release' or options.snapshot:
+ self.version = repo.date.strftime("%Y%m%d%H%M%S")
+ self.version += '-%s' % (repo.shorthash)
+ if repo.branch != '':
+ self.version += '-%s' % (repo.branch)
+
+ self.debversion = repo.date.strftime("%Y%m%d%H%M%S")
+ self.debversion += '-%s' % (repo.shorthash)
+ if repo.branch != '':
+ self.debversion += '-%s' % (repo.branch)
+
 url_ctype = '_unstable'
 url_ntype = 'unstable'
 self.build = time.strftime('%Y%m%d') + '01'
- self.title = '%s svn%d (%s)' % (self.name,repo.rev,self.build)
+ self.title = '%s %s (%s)' % (self.name,self.version,self.build)
 else:
- self.version = 'rev%d' % (repo.rev)
- url_ctype = '_unofficial'
- url_ntype = 'unofficial'
- self.build = time.strftime('%Y%m%d') + '99'
- self.title = '%s rev%d (%s)' % (self.name,repo.rev,self.build)
+ m = re.match('^([a-zA-Z]+)\.([0-9]+)$', suffix)
+ if not m:
+ # Regular release
+ self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint)
+ self.debversion = '%d.%d.%d' % (self.vmajor, self.vminor, self.vpoint)
+ url_ctype = ''
+ url_ntype = 'stable'
+ else:
+ (special, spoint,) = m.groups()
+ self.special = special
+ self.spoint = int(spoint)
+ self.version = '%d.%d.%d-%s.%d' % (self.vmajor,self.vminor,self.vpoint, self.special, self.spoint)
+ self.debversion = '%d.%d.%d~%s.%d' % (self.vmajor, self.vminor, self.vpoint, self.special, self.spoint)
+ url_ctype = '_unstable'
+ url_ntype = 'unstable'
+
+ self.build = time.strftime('%Y%m%d') + '00'
+ self.title = '%s %s (%s)' % (self.name,self.version,self.build)
 
 self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
 self.url_appnote = 'https://handbrake.fr/appcast/%s.html' % (url_ntype)
@@ -1206,13 +1247,13 @@
 
 h = IfHost( 'enable HWD features', '*-*-*', none=optparse.SUPPRESS_HELP ).value
 grp.add_option( '--enable-hwd', default=False, action='store_true', help=h )
- 
+
 h = IfHost( 'enable use of x265 encoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value
 grp.add_option( '--enable-x265', default=True, action='store_true', help=h )
 grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' )
 
 h = IfHost( 'enable use of fdk-aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h )
+ grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=h )
 grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' )
 
 h = IfHost( 'enable use of libav aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
@@ -1276,6 +1317,13 @@
 for select in SelectTool.selects:
 select.cli_add_option( grp )
 cli.add_option_group( grp )
+
+ ## add build options
+ grp = OptionGroup( cli, 'Build Options' )
+ grp.add_option( '--snapshot', default=False, action='store_true',
+ help='Force a snapshot build' )
+ cli.add_option_group( grp )
+
 return cli
 
 ###############################################################################
@@ -1647,19 +1695,23 @@
 doc.add( 'HB.version.major', project.vmajor )
 doc.add( 'HB.version.minor', project.vminor )
 doc.add( 'HB.version.point', project.vpoint )
+ doc.add( 'HB.version.suffix', project.suffix )
 doc.add( 'HB.version', project.version )
+ doc.add( 'HB.debversion', project.debversion )
 doc.add( 'HB.version.hex', '%04x%02x%02x%08x' % (project.vmajor,project.vminor,project.vpoint,repo.rev) )
 
 doc.add( 'HB.build', project.build )
 
 doc.add( 'HB.repo.url', repo.url )
- doc.add( 'HB.repo.root', repo.root )
- doc.add( 'HB.repo.branch', repo.branch )
- doc.add( 'HB.repo.uuid', repo.uuid )
+ doc.add( 'HB.repo.tag', repo.tag )
 doc.add( 'HB.repo.rev', repo.rev )
- doc.add( 'HB.repo.date', repo.date )
- doc.add( 'HB.repo.official', repo.official )
+ doc.add( 'HB.repo.hash', repo.hash )
+ doc.add( 'HB.repo.shorthash', repo.shorthash )
+ doc.add( 'HB.repo.branch', repo.branch )
+ doc.add( 'HB.repo.remote', repo.remote )
 doc.add( 'HB.repo.type', repo.type )
+ doc.add( 'HB.repo.official', repo.official )
+ doc.add( 'HB.repo.date', repo.date.strftime("%Y-%m-%d %H:%M:%S") )
 
 doc.addBlank()
 doc.add( 'HOST.spec', host.spec )
@@ -1700,7 +1752,7 @@
 doc.add( 'BUILD/', cfg.build_final + os.sep )
 doc.add( 'PREFIX', cfg.prefix_final )
 doc.add( 'PREFIX/', cfg.prefix_final + os.sep )
- 
+
 doc.addBlank()
 doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ))
 doc.add( 'FEATURE.local_autotools', int( options.enable_local_autotools ))
@@ -1850,7 +1902,7 @@
 try:
 cfg.record_log()
 except:
- pass 
- sys.exit( 1 ) 
+ pass
+ sys.exit( 1 )
 
 sys.exit( 0 )

HandBrake-0.10.2.tar.bz2/make/include/tool.defs -> HandBrake-0.10.5.tar.bz2/make/include/tool.defs Changed

HandBrake-0.10.5.tar.bz2/pkg/linux/debian/control.vivid Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.10.5.tar.bz2/pkg/linux/debian/control.wily Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, wget, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-0.10.5.tar.bz2/pkg/linux/debian/rules.vivid Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --disable-gtk-update-checks --prefix=/usr
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zbzip2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-0.10.5.tar.bz2/pkg/linux/debian/rules.wily Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --disable-gtk-update-checks --prefix=/usr
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zbzip2
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-0.10.2.tar.bz2/pkg/linux/module.defs -> HandBrake-0.10.5.tar.bz2/pkg/linux/module.defs Changed

@@ -1,8 +1,19 @@
 PKG.deb.machine = `dpkg --print-architecture`
 PKG.rpm.machine = `rpm -E "%_target_cpu"`
-PKG.release = 1
+PKG.release = $(HB.repo.rev)
 PKG.rpm.dist = `rpm -E "%dist"`
 
+ifeq ($(HB.repo.tag),)
+    tag = 0.0.0
+endif
+ifeq ($(HB.repo.type),release)
+    PKG.rpm.hb.version = $(tag)
+else ifeq ($(HB.repo.branch),)
+    PKG.rpm.hb.version = $(tab).$(HB.repo.shorthash)
+else
+    PKG.rpm.hb.version = $(tag).$(HB.repo.shorthash).$(HB.repo.branch)
+endif
+
 
 ###############################################################################
 
@@ -12,27 +23,29 @@
 
 ###############################################################################
 
-PKG.rpm.src.tar.bz2 = $(STAGE.out.src/)rpm/$(PKG.basename).tar.bz2
+PKG.rpm.basename = $(HB.name.lower)-$(PKG.rpm.hb.version)
+PKG.rpm.src.tar.bz2 = $(STAGE.out.src/)rpm/$(PKG.rpm.basename).tar.bz2
 STAGE.out.rpm.src/ = $(STAGE.out.src/)rpm/
 
 PKG.debian  = $(PKG.in/)linux/debian
-PKG.cli.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_CLI_$(BUILD.machine).deb
-PKG.gui.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_GUI_$(BUILD.machine).deb
-PKG.deb.basename = handbrake-$(HB.version)
-PKG.src.deb.tar = handbrake_$(HB.version).tar.gz
+PKG.cli.deb = $(PKG.out/)$(HB.name)-$(HB.debversion)-Ubuntu_CLI_$(BUILD.machine).deb
+PKG.gui.deb = $(PKG.out/)$(HB.name)-$(HB.debversion)-Ubuntu_GUI_$(BUILD.machine).deb
+PKG.deb.basename = $(HB.name.lower)-$(HB.debversion)
+PKG.src.deb.tar = $(HB.name.lower)_$(HB.debversion).tar.gz
 PKG.src.deb.stamp = $(STAGE.out.src/).debsrc.stamp
-PKG.src.deb = $(PKG.out/)handbrake_$(HB.version).deb
+PKG.src.deb = $(PKG.out/)$(HB.name.lower)_$(HB.debversion).deb
 
-PKG.cli.tmp.deb = $(PKG.out/)handbrake-cli_$(HB.version)_$(PKG.deb.machine).deb
-PKG.gui.tmp.deb = $(PKG.out/)handbrake-gtk_$(HB.version)_$(PKG.deb.machine).deb
+PKG.cli.tmp.deb = $(PKG.out/)$(HB.name.lower)-cli_$(HB.debversion)_$(PKG.deb.machine).deb
+PKG.gui.tmp.deb = $(PKG.out/)$(HB.name.lower)-gtk_$(HB.debversion)_$(PKG.deb.machine).deb
 
 PKG.native.rpm.stamp = $(RPM.out/).rpm.stamp
+PKG.rpm.stamp = $(PKG.out/).rpm.stamp
 
-PKG.gui.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-gui-$(HB.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm
-PKG.cli.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-cli-$(HB.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm
+PKG.gui.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name.lower)-gui-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm
+PKG.cli.native.rpm = $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name.lower)-cli-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm
 
-PKG.cli.rpm  = $(PKG.out/)$(HB.name)-$(HB.version)-Fedora_CLI_$(BUILD.machine).rpm
-PKG.gui.rpm  = $(PKG.out/)$(HB.name)-$(HB.version)-Fedora_GUI_$(BUILD.machine).rpm
+PKG.cli.rpm  = $(PKG.out/)$(HB.name.lower)-cli-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm
+PKG.gui.rpm  = $(PKG.out/)$(HB.name.lower)-gui-$(PKG.rpm.hb.version)-$(PKG.release)$(PKG.rpm.dist).$(PKG.rpm.machine).rpm
 RPM.out  = $(STAGE.out/)rpm
 RPM.out/ = $(STAGE.out/)rpm/
 RPMROOT.out  = $(PWD)/$(STAGE.out/)rpmroot

HandBrake-0.10.2.tar.bz2/pkg/linux/module.rules -> HandBrake-0.10.5.tar.bz2/pkg/linux/module.rules Changed

@@ -1,5 +1,5 @@
 pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb)
-pkg.create.rpm:: $(PKG.gui.rpm)
+pkg.create.rpm:: $(PKG.rpm.stamp)
 pkg.create.src.deb:: $(PKG.src.deb.stamp)
 pkg.create.tar:: pkg.create $(PKG.cli.tar)
 
@@ -21,17 +21,18 @@
 # RPM binary package rules
 #
 $(PKG.rpm.src.tar.bz2): $(STAGE.out.rpm.src/)
-	$(TAR.exe) cjf $@ -C $(STAGE.out.rpm.src/) $(PKG.basename)
+	$(TAR.exe) cjf $(PKG.rpm.src.tar.bz2) -C $(STAGE.out.rpm.src/) $(PKG.rpm.basename)
 
 $(STAGE.out.rpm.src/): GNUmakefile
 #	-$(MKDIR.exe) -p $(STAGE.out.rpm.src/)$(PKG.basename)
 #	tar c --exclude build ../* | tar x -C $(STAGE.out.rpm.src/)$(PKG.basename)
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
-	svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(PKG.basename)
-	svn info $(HB.repo.url)@$(HB.repo.rev) > $@/$(PKG.basename)/version.txt
-	-$(MKDIR.exe) $(STAGE.out.rpm.src/)$(PKG.basename)/download
-	$(CP.exe) $(SRC/)download/*.tar.* $(STAGE.out.rpm.src/)$(PKG.basename)/download
+	$(MKDIR.exe) -p $@
+	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.rpm.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $@
+	$(SRC/)scripts/repo-info.sh $(SRC/) > $@/$(PKG.rpm.basename)/version.txt
+	-$(MKDIR.exe) $(STAGE.out.rpm.src/)$(PKG.rpm.basename)/download
+	$(CP.exe) $(SRC/)download/*.tar.* $(STAGE.out.rpm.src/)$(PKG.rpm.basename)/download
 
 $(PKG.native.rpm.stamp): $(PKG.rpm.src.tar.bz2)
 	-$(MKDIR.exe) -p $(RPM.out/)SOURCES
@@ -40,18 +41,19 @@
 	-$(MKDIR.exe) -p $(RPM.out/)RPMS
 	-$(MKDIR.exe) -p $(RPM.out/)SRPMS
 	-$(MKDIR.exe) -p $(RPMROOT.out/)
-	echo "%define name $(HB.name)" > $(RPM.out/)SPECS/ghb.spec
-	echo "%define release 1" >> $(RPM.out/)SPECS/ghb.spec
-	echo "%define version $(HB.version)" >> $(RPM.out/)SPECS/ghb.spec
+	echo "%define name $(HB.name.lower)" > $(RPM.out/)SPECS/ghb.spec
+	echo "%define release $(PKG.release)" >> $(RPM.out/)SPECS/ghb.spec
+	echo "%define version $(PKG.rpm.hb.version)" >> $(RPM.out/)SPECS/ghb.spec
 	cat $(GTK.src/)ghb.spec >> $(RPM.out/)SPECS/ghb.spec
 	$(CP.exe) $(PKG.rpm.src.tar.bz2) $(RPM.out/)SOURCES
 	rpmbuild --define="_topdir $(PWD)/$(RPM.out)" --buildroot $(RPMROOT.out) -ba $(RPM.out/)SPECS/ghb.spec
 	$(TOUCH.exe) $(PKG.native.rpm.stamp)
 
-$(PKG.gui.rpm): | $(dir $(PKG.gui.rpm))
-$(PKG.gui.rpm): $(PKG.native.rpm.stamp)
+$(PKG.rpm.stamp): | $(dir $(PKG.gui.rpm))
+$(PKG.rpm.stamp): $(PKG.native.rpm.stamp)
 	$(CP.exe) $(PKG.gui.native.rpm) $(PKG.gui.rpm)
 	$(CP.exe) $(PKG.cli.native.rpm) $(PKG.cli.rpm)
+	$(TOUCH.exe) $(PKG.rpm.stamp)
 
 #
 # Debian binary package rules
@@ -63,7 +65,7 @@
 	fakeroot $(MAKE) -C $(SRC/) -f debian/rules clean
 	$(MAKE) BUILDDIR=$(PWD)/$(BUILD) CONFIGURE=configure -C $(SRC/) -f debian/rules build
 	echo $(PKG.out/)
-	fakeroot $(MAKE) FORCEVERSION="-- -v$(HB.version)" BUILDDIR=$(PWD)/$(BUILD) CONFIGURE=configure PKGDESTDIR=$(PWD)/$(PKG.out/) -C $(SRC/) -f debian/rules binary
+	fakeroot $(MAKE) FORCEVERSION="-- -v$(HB.debversion)" BUILDDIR=$(PWD)/$(BUILD) CONFIGURE=configure PKGDESTDIR=$(PWD)/$(PKG.out/) -C $(SRC/) -f debian/rules binary
 
 $(PKG.gui.deb): | $(dir $(PKG.gui.deb))
 $(PKG.gui.deb): $(PKG.gui.tmp.deb)
@@ -77,32 +79,49 @@
 # Debian source package rules
 #
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
-	(cd $(STAGE.out.src/)utopic && dput handbrake-snapshots handbrake_$(HB.version)ppa1~utopic1_source.changes )
-	(cd $(STAGE.out.src/)trusty && dput handbrake-snapshots handbrake_$(HB.version)ppa1~trusty1_source.changes )
+	(cd $(STAGE.out.src/)wily && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~wily1_source.changes )
+	(cd $(STAGE.out.src/)vivid && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~vivid1_source.changes )
+	(cd $(STAGE.out.src/)trusty && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~trusty1_source.changes )
 
 $(PKG.src.deb.stamp): GNUmakefile
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
-	svn export -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)utopic/$(PKG.deb.basename)
-	svn info $(HB.repo.url)@$(HB.repo.rev) > $(STAGE.out.src/)utopic/$(PKG.deb.basename)/version.txt
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)utopic/$(PKG.deb.basename)
-	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)utopic/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/control.utopic $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/rules.utopic $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~utopic1) utopic; urgency=low" > $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
-	echo " * Snapshot" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
-	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)utopic/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)utopic/$(PKG.src.deb.tar) -C $(STAGE.out.src/)utopic $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)utopic/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	svn export -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)trusty/$(PKG.deb.basename)
-	svn info $(HB.repo.url)@$(HB.repo.rev) > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/version.txt
+	$(MKDIR.exe) -p $(STAGE.out.src/)wily
+	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)wily/
+	$(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)wily/$(PKG.deb.basename)/version.txt
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)wily/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)wily/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/control.wily $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/rules.wily $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/rules
+	echo "$(HB.name.lower) ($(HB.debversion)-zhb-1ppa1~wily1) wily; urgency=low" > $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
+	echo " * Snapshot" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
+	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)wily/$(PKG.src.deb.tar) -C $(STAGE.out.src/)wily $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)wily/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	$(MKDIR.exe) -p $(STAGE.out.src/)vivid
+	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)vivid/
+	$(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)vivid/$(PKG.deb.basename)/version.txt
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)vivid/$(PKG.deb.basename)
+	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)vivid/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/control.vivid $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/rules.vivid $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/rules
+	echo "$(HB.name.lower) ($(HB.debversion)-zhb-1ppa1~vivid1) vivid; urgency=low" > $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
+	echo " * Snapshot" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
+	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com> Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)vivid/$(PKG.src.deb.tar) -C $(STAGE.out.src/)vivid $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)vivid/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	$(MKDIR.exe) -p $(STAGE.out.src/)trusty
+	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)trusty/
+	$(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/version.txt
 	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)trusty/$(PKG.deb.basename)
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)trusty/$(PKG.deb.basename)
 	$(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control
 	$(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules
-	echo "handbrake ($(HB.version)ppa1~trusty1) trusty; urgency=low" > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	echo "$(HB.name.lower) ($(HB.debversion)-zhb-1ppa1~trusty1) trusty; urgency=low" > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
 	echo " * Snapshot" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
 	echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
 	echo "" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog

HandBrake-0.10.2.tar.bz2/pkg/mingw/module.defs -> HandBrake-0.10.5.tar.bz2/pkg/mingw/module.defs Changed

HandBrake-0.10.2.tar.bz2/pkg/mingw/module.rules -> HandBrake-0.10.5.tar.bz2/pkg/mingw/module.rules Changed

HandBrake-0.10.2.tar.bz2/pkg/module.defs -> HandBrake-0.10.5.tar.bz2/pkg/module.defs Changed

HandBrake-0.10.2.tar.bz2/pkg/module.rules -> HandBrake-0.10.5.tar.bz2/pkg/module.rules Changed

HandBrake-0.10.5.tar.bz2/scripts/repo-info.sh Added

@@ -0,0 +1,79 @@
+#! /bin/bash
+#
+# Retrieves git repository info for directory ${1} using command ${2}
+
+function repo_info()
+{
+    local repo_dir git_exe commit upstream err
+
+    # Process args
+    repo_dir='.'
+    if [[ ${1} ]]; then
+        repo_dir=${1}
+    fi
+    git_exe='git'
+    if [[ ${2} ]]; then
+        git_exe=${2}
+    fi
+
+    # Switch to working directory
+    if ! cd ${repo_dir} 2>/dev/null; then
+        echo "Invalid directory ${repo_dir}." 1>&2
+        return 1
+    fi
+
+    # Check whether we have git
+    if ! hash ${git_exe} 2>/dev/null; then
+        echo "Command '${git_exe}' not found." 1>&2
+        return 1
+    fi
+
+    # Check if there is a valid git repo here
+    HASH=$(${git_exe} rev-parse HEAD)
+    SHORTHASH=$(${git_exe} rev-parse --short HEAD)
+    err=$?
+    if [[ ${err} -ne 0 ]]; then
+        echo "Not a valid repository." 1>&2
+        return ${err}
+    elif [[ -z ${HASH} ]]; then
+        echo "Not a valid repository." 1>&2
+        return 1
+    fi
+
+    # Retrieve info
+    URL=$(${git_exe} config remote.origin.url)
+
+    # check if an annotated tag is reachable from HEAD
+    TAG=$(${git_exe} describe --tags --abbrev=0 --exact-match --match \[0-9\]\*.\[0-9\]\*.\[0-9\]\* HEAD 2> /dev/null)
+    if [[ ${TAG} ]]; then
+        # if TAG is a release tag and HASH == TAG_HASH, this is release code
+        TAG_HASH=$(${git_exe} rev-list ${TAG} --max-count=1)
+        REV=$(${git_exe} rev-list $(${git_exe} merge-base ${TAG} HEAD).. --count)
+    else
+        REV=$(${git_exe} rev-list HEAD --count)
+    fi
+
+    BRANCH=$(${git_exe} symbolic-ref -q --short HEAD)
+    REMOTE="${URL}"
+    upstream=$(${git_exe} config branch.${BRANCH}.remote)
+    if [[ ${upstream} ]]; then
+        REMOTE="${upstream}"
+    fi
+    DATE=$(${git_exe} log -1 --format="format:%ci")
+
+    # Output
+    # Only write tag and rev if they exist.
+    echo "URL=${URL}"
+    echo "HASH=${HASH}"
+    echo "SHORTHASH=${SHORTHASH}"
+    if [[ ${TAG} ]]; then echo "TAG=${TAG}"; fi
+    if [[ ${TAG_HASH} ]]; then echo "TAG_HASH=${TAG_HASH}"; fi
+    if [[ ${REV} ]]; then echo "REV=${REV}"; fi
+    echo "BRANCH=${BRANCH}"
+    echo "REMOTE=${REMOTE}"
+    echo "DATE=${DATE}"
+
+    return 0
+}
+
+repo_info "$@"

HandBrake-0.10.5.tar.bz2/scripts/tag-release.sh Added

@@ -0,0 +1,211 @@
+#! /bin/bash
+#
+# Usage: tag-release.sh <release-ver> [<ref>]
+#
+# Creates a new bugfix branch and release tag for a release.
+# Optionally, the release can be based off a specific git ref.
+# Default is HEAD of the current branch.
+#
+# The script does a lot of error checking, but boils down to
+# the following actions.
+#
+# For major/minor releases (X.Y.0) from master branch:
+# git checkout -b X.Y.x
+# git tag -a X.Y.Z -m "X.Y.Z" HEAD
+# and optionally:
+# git push -u origin X.Y.x
+# git push origin refs/tags/X.Y.Z
+#
+# For bugfix releases from associated branch (X.Y.x):
+# git tag -a X.Y.Z -m "X.Y.Z" HEAD
+# and optionally:
+# git push origin refs/tags/X.Y.Z
+#
+
+GIT_EXE='git'
+
+function validate_repo()
+{
+ local HASH err AHEAD BEHIND proceed
+
+ # Check whether we have git
+ if ! hash ${GIT_EXE} 2>/dev/null; then
+ echo "Command '${GIT_EXE}' not found." 1>&2
+ return 1
+ fi
+
+ # Check if there is a valid git repo here
+ HASH=$(${GIT_EXE} rev-parse HEAD)
+ err=$?
+ if [[ ${err} -ne 0 ]]; then
+ echo "Not a valid repository." 1>&2
+ return ${err}
+ elif [[ -z ${HASH} ]]; then
+ echo "Not a valid repository." 1>&2
+ return 1
+ fi
+
+ if [[ -n "$(${GIT_EXE} status --porcelain)" ]]; then
+ echo "There are uncommitted changes. Aborting." 1>&2
+ return 1
+ fi
+
+ echo "Fetching repo data..."
+ ${GIT_EXE} fetch
+ err=$?
+ if [[ ${err} -ne 0 ]]; then
+ echo "Failed to fetch repo data." 1>&2
+ return ${err}
+ fi
+ AHEAD=$(${GIT_EXE} rev-list @{u}..HEAD --count)
+ BEHIND=$(${GIT_EXE} rev-list HEAD..@{u} --count)
+ if [[ ${AHEAD} -ne 0 ]]; then
+ echo "There are unpushed changes. Continue anyway? (y/N)"
+ read proceed
+ if [[ ( "x${proceed}" != "xy" ) && ( "x${proceed}" != "xY" ) ]] ; then
+ echo "Aborting..."
+ return 1
+ fi
+ fi
+ if [[ ${BEHIND} -ne 0 ]]; then
+ echo "There are unmerged upstream changes. Continue anyway? (y/N)"
+ read proceed
+ if [[ ( "x${proceed}" != "xy" ) && ( "x${proceed}" != "xY" ) ]] ; then
+ echo "Aborting..."
+ return 1
+ fi
+ fi
+}
+
+function tag_release()
+{
+ local TAG REF COMMIT BRANCH proceed new_branch ERR HASH
+
+ TAG=${1}
+ REF=${2}
+
+ if [ "x${TAG}" == "x" ]; then
+ echo "Missing release tag (e.g. 0.10.0)"
+ fi
+
+ # bugfix branch name
+ BRANCH=${TAG%.[0-9]*}.x
+
+ if [ "x${REF}" == "x" ]; then
+ echo "Creating release tag ${TAG} and branch ${BRANCH} from HEAD, proceed? (y/N)"
+ # retrive full hash of HEAD
+ COMMIT=$(${GIT_EXE} rev-list HEAD --max-count=1)
+ else
+ echo "Creating release tag ${TAG} and branch ${BRANCH} from ${REF}, proceed? (y/N)"
+ # retrieve full hash from ref or short hash
+ COMMIT=$(${GIT_EXE} rev-list ${REF} --max-count=1)
+ fi
+ read proceed
+ if [[ ( "x${proceed}" != "xy" ) && ( "x${proceed}" != "xY" ) ]] ; then
+ echo "Aborting..."
+ return 0
+ fi
+
+ # check if the remote branch already exists
+ ${GIT_EXE} rev-parse --quiet --verify origin/${BRANCH} > /dev/null
+ if [ $? -ne 0 ]; then
+ # remote branch does not exist
+ new_branch=1
+ # does the branch already exist locally?
+ ${GIT_EXE} rev-parse --quiet --verify ${BRANCH} > /dev/null
+ if [ $? -ne 0 ]; then
+ # local branch does not exist
+ # create bugfix branch from commit
+ ${GIT_EXE} checkout "${COMMIT}" -b "${BRANCH}"
+ ERR=$?
+ if [ ${ERR} -ne 0 ]; then
+ echo "Failed to create branch ${BRANCH}"
+ return ${ERR}
+ fi
+ else
+ # local branch already exists
+ # When the branch already exists, make sure it is being used!
+ current_branch=$(${GIT_EXE} rev-parse --abbrev-ref HEAD)
+ if [ "$current_branch" != "${BRANCH}" ]; then
+ echo "You did not checkout the correct branch ${BRANCH} for tag ${TAG}"
+ return 1
+ fi
+ fi
+ else
+ new_branch=0
+ # When the branch already exists, make sure it is being used!
+ current_branch=$(${GIT_EXE} rev-parse --abbrev-ref HEAD)
+ if [ "$current_branch" != "${BRANCH}" ]; then
+ echo "You did not checkout the correct branch ${BRANCH} for tag ${TAG}"
+ return 1
+ fi
+ fi
+
+ # at this point we should be at the head of the tracking branch
+ # for this release. Make certain that HEAD matches COMMIT
+ HASH=$(${GIT_EXE} rev-list HEAD --max-count=1)
+ if [ ${HASH} != ${COMMIT} ]; then
+ echo "Commit specified does not match current branch HEAD"
+ return 1
+ fi
+
+ # create tag
+ ${GIT_EXE} tag -a "${TAG}" -m "${TAG}" HEAD
+ ERR=$?
+ if [ ${ERR} -ne 0 ]; then
+ echo "Failed to create tag ${TAG}"
+ # cleanup... remove the branch that was created
+ ${GIT_EXE} branch -d "${BRANCH}"
+ return ${ERR}
+ fi
+
+ # checkout tag in preparation for building release
+ # this should put you in a "detached HEAD" state
+ ${GIT_EXE} checkout "${TAG}"
+ ERR=$?
+ if [ ${ERR} -ne 0 ]; then
+ echo "Failed to checkout tag ${TAG}"
+ # cleanup... remove the branch that was created
+ ${GIT_EXE} branch -d "${BRANCH}"
+ return ${ERR}
+ fi
+
+ remote=$(${GIT_EXE} config remote.origin.url)
+ echo
+ echo "Do you wish to push this release branch and tag to $remote? (y/N)"
+ echo "You may want to do this manually after creating and verifying release."
+ echo "e.g."
+ echo " git push -u origin ${BRANCH}"
+ echo " git push origin refs/tags/${TAG}"
+ read proceed
+ if [[ ( "x${proceed}" == "xy" ) || ( "x${proceed}" == "xY" ) ]] ; then
+ if [ $new_branch .eq 1 ]; then
+ ${GIT_EXE} push -u origin "${BRANCH}"
+ ERR=$?
+ if [ ${ERR} -ne 0 ]; then
+ echo "Failed to push branch ${BRANCH} to remote"
+ return ${ERR}
+ fi
+ fi
+ ${GIT_EXE} push origin refs/tags/"${TAG}"
+ ERR=$?
+ if [ ${ERR} -ne 0 ]; then
+ echo "Failed to push tag ${BRANCH} to remote"
+ return ${ERR}
+ fi
+ else
+ echo "Branch and tag are local, changes not pushed to remote!"
+ fi
+
+}
+
+function main()
+{
+ if validate_repo; then
+ tag_release "$@"
+ else
+ return $?
+ fi
+}
+
+main "$@"

HandBrake-0.10.2.tar.bz2/test/module.defs -> HandBrake-0.10.5.tar.bz2/test/module.defs Changed

HandBrake-0.10.2.tar.bz2/test/test.c -> HandBrake-0.10.5.tar.bz2/test/test.c Changed

@@ -3640,12 +3640,16 @@
     #define QSV_IMPLEMENTATION   297
     #define FILTER_NLMEANS       298
     #define FILTER_NLMEANS_TUNE  299
+    #define VERSION              300
+    #define DESCRIBE             301
 
     for( ;; )
     {
         static struct option long_options[] =
           {
             { "help",        no_argument,       NULL,    'h' },
+            { "version",     no_argument,       NULL,    VERSION },
+            { "describe",    no_argument,       NULL,    DESCRIBE },
             { "update",      no_argument,       NULL,    'u' },
             { "verbose",     optional_argument, NULL,    'v' },
             { "no-dvdnav",   no_argument,       NULL,    DVDNAV },
@@ -3788,6 +3792,12 @@
             case 'h':
                 ShowHelp();
                 exit( 0 );
+            case VERSION:
+                printf("HandBrake %s\n", hb_get_version(NULL));
+                exit( 0 );
+            case DESCRIBE:
+                printf("%s\n", hb_get_full_description());
+                exit( 0 );
             case 'u':
                 update = 1;
                 break;

HandBrake-0.10.2.tar.bz2/version.txt -> HandBrake-0.10.5.tar.bz2/version.txt Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj Changed

HandBrake-0.10.5.tar.bz2/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs Added

@@ -0,0 +1,36 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("HandBrake")]
+[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, video transcoder.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HandBrake Team")]
+[assembly: AssemblyProduct("HandBrake")]
+[assembly: AssemblyCopyright("Copyright © 2003-2016 HandBrake Team")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("80ba130e-73a6-4c35-8f82-a6bd4f0ff4d2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("0.10.5.0")]
+[assembly: AssemblyFileVersion("0.10.5.0")]
+[assembly: NeutralResourcesLanguage("en-GB")]
+

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Properties/AssemblyInfo.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Properties/AssemblyInfo.cs Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake.Server/Properties/AssemblyInfo.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrake.Server/Properties/AssemblyInfo.cs Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrake10.sln.DotSettings -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrake10.sln.DotSettings Changed

@@ -490,6 +490,7 @@
 	<s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj Changed

@@ -156,6 +156,7 @@
 <Compile Include="Helpers\FileHelper.cs" />
 <Compile Include="Model\ScanMode.cs" />
 <Compile Include="Factories\HBConfigurationFactory.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
 <Compile Include="Services\Interfaces\IUserSettingService.cs" />
 <Compile Include="Services\UserSettingService.cs" />
 <Compile Include="Utilities\DelayedActionProcessor.cs" />
@@ -344,9 +345,6 @@
 </Compile>
 </ItemGroup>
 <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs">
- <SubType>Code</SubType>
- </Compile>
 <Compile Include="Properties\Resources.Designer.cs">
 <AutoGen>True</AutoGen>
 <DesignTime>True</DesignTime>
@@ -365,10 +363,6 @@
 <None Include="app.config" />
 <None Include="Installer\Installer.nsi" />
 <None Include="Installer\Installer64.nsi" />
- <None Include="Installer\MakeNightly.nsi.tmpl" />
- <None Include="Installer\MakeNightly64.nsi.tmpl" />
- <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" />
- <None Include="Properties\AssemblyInfo.cs.tmpl" />
 <None Include="Properties\Settings.settings">
 <Generator>SettingsSingleFileGenerator</Generator>
 <LastGenOutput>Settings.Designer.cs</LastGenOutput>

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer.nsi -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer.nsi Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer64.nsi -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Installer/Installer64.nsi Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs Changed

@@ -1,15 +1,5 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
+using System.Resources;
 using System.Reflection;
-using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -18,11 +8,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("HandBrake")]
-[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.")]
+[assembly: AssemblyDescription("HandBrake is an open-source, GPL-licensed, multiplatform, video transcoder.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HandBrake Team")]
 [assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2003-2015 HandBrake Team ")]
+[assembly: AssemblyCopyright("Copyright © 2003-2016 HandBrake Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,25 +21,8 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>. For example, if you are using US english
-//in your source files, set the <UICulture> to en-US. Then uncomment
-//the NeutralResourceLanguage attribute below. Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
- //(used if a resource is not found in the page, 
- // or application resource dictionaries)
- ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
- //(used if a resource is not found in the page, 
- // app, or any theme specific resource dictionaries)
-)]
-
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("939fb917-ac50-425a-9ef5-4f8144e200ff")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -58,8 +31,16 @@
 // Build Number
 // Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.5311")]
-[assembly: NeutralResourcesLanguage("")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.10.5.0")]
+[assembly: AssemblyFileVersion("0.10.5.0")]
+[assembly: NeutralResourcesLanguage("en-GB")]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page, 
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page, 
+ // app, or any theme specific resource dictionaries)
+)]

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.resx -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Properties/Resources.resx Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs Changed

@@ -375,10 +375,12 @@
                 if (this.SelectedPreset != null)
                 {
                     // Main Window Settings
-                    this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
-                    this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
+                    this.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
+                    this.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
                     this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
 
+                    this.NotifyOfPropertyChange("Task.OptimizeMP4");
+
                     // Tab Settings
                     this.PictureSettingsViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
                     this.VideoViewModel.SetPreset(this.SelectedPreset, this.CurrentTask);
@@ -1028,6 +1030,39 @@
             }
         }
 
+        public bool OptimizeMP4
+        {
+            get
+            {
+                return this.CurrentTask.OptimizeMP4;
+            }
+            set
+            {
+                if (value == this.CurrentTask.OptimizeMP4)
+                {
+                    return;
+                }
+                this.CurrentTask.OptimizeMP4 = value;
+                this.NotifyOfPropertyChange(() => this.OptimizeMP4);
+            }
+        }
+
+        public bool IPod5GSupport
+        {
+            get
+            {
+                return this.CurrentTask.IPod5GSupport;
+            }
+            set
+            {
+                if (value == this.CurrentTask.IPod5GSupport)
+                {
+                    return;
+                }
+                this.CurrentTask.IPod5GSupport = value;
+                this.NotifyOfPropertyChange(() => this.IPod5GSupport);
+            }
+        }
         #endregion
 
         #region Load and Shutdown Handling

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs Changed

HandBrake-0.10.2.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml -> HandBrake-0.10.5.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml Changed

@@ -484,7 +484,7 @@
                               Margin="8,0,0,0"
                               VerticalAlignment="Center"
                               Content="Web Optimized"
-                              IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
+                              IsChecked="{Binding Path=OptimizeMP4}"
                               Visibility="{Binding IsMkv,
                                                    Converter={StaticResource boolToVisConverter},
                                                    ConverterParameter=true}"
@@ -493,7 +493,7 @@
                               Margin="8,0,0,0"
                               VerticalAlignment="Center"
                               Content="iPod 5G Support"
-                              IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
+                              IsChecked="{Binding Path=IPod5GSupport}"
                               Visibility="{Binding IsMkv,
                                                    Converter={StaticResource boolToVisConverter},
                                                    ConverterParameter=true}"

HandBrake-0.10.2.tar.bz2/win/CS/Properties/AssemblyInfo.cs.tmpl -> HandBrake-0.10.5.tar.bz2/win/CS/Properties/AssemblyInfo.cs.tmpl Changed

HandBrake-0.10.2.tar.bz2/win/CS/build.xml -> HandBrake-0.10.5.tar.bz2/win/CS/build.xml Changed

@@ -49,17 +49,9 @@
 
 
 <Target Name="NightlyPreBuild">
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.Nightly.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />
 </Target>
 
 <Target Name="PreBuild">
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrakeWPF\Properties\AssemblyInfo.cs" />
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi.tmpl $(ProjectDir)HandBrakeWPF\Installer\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
- <Exec Command="subwcrev.exe ../../ $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs.tmpl $(ProjectDir)HandBrake.ApplicationServices\Properties\AssemblyInfo.cs" />
 </Target>

Overview

Request 2508 (accepted)

Request History