Projects
Multimedia
handbrake
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 16
View file
handbrake.changes
Changed
@@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Sat Feb 20 16:31:51 UTC 2016 - joerg.lorenzen@ki.tng.de + +- update to version 0.10.5 + + Removal of FDK AAC from our binary releases, --enable-fdk is + required for "non-free" builds if compiling from source. + - Please see out AAC Encoder Change Announcement to understand + what this means. + + Updated x265 to 1.9 which brings bug fixes and performance + improvements. + + Few minor bug fixes since the 0.10.3 release. This includes + improvements in large AVI file handling. +- Build against ffmpeg-3.0 + +- version 0.10.3 + + Various bug fixes for all platforms and the core engine. + + Updated x265 to 1.8 which brings numerous bug fixes and some + performance improvements. + +------------------------------------------------------------------- Sat Jan 09 14:51:33 UTC 2016 - joerg.lorenzen@ki.tng.de - Removed all 3rd party tarballs and addded HandBrake-build-shared.patch
View file
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
View file
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()
View file
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
View file
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()
View file
HandBrake-0.10.2.tar.bz2/contrib/x265/A00-maxCUSize-idiocy.patch
Deleted
@@ -1,19 +0,0 @@ -diff -r 32d72a0285e0 source/common/param.cpp ---- a/source/common/param.cpp Tue Feb 10 21:38:22 2015 -0600 -+++ b/source/common/param.cpp Thu Feb 12 09:12:01 2015 -0700 -@@ -1151,6 +1151,7 @@ - - int x265_set_globals(x265_param *param) - { -+#if 0 - static int once /* = 0 */; - - if (ATOMIC_INC(&once) > 1) -@@ -1162,6 +1163,7 @@ - } - } - else -+#endif - { - uint32_t maxLog2CUSize = (uint32_t)g_log2Size[param->maxCUSize]; -
View file
HandBrake-0.10.2.tar.bz2/contrib/x265/A01-cudata-init.patch
Deleted
@@ -1,12 +0,0 @@ -diff -r 018e8bbaa854 source/common/cudata.cpp ---- a/source/common/cudata.cpp Fri Feb 27 11:46:09 2015 +0530 -+++ b/source/common/cudata.cpp Sun Mar 01 09:40:58 2015 -0800 -@@ -161,7 +161,7 @@ - m_vChromaShift = CHROMA_V_SHIFT(csp); - m_numPartitions = NUM_4x4_PARTITIONS >> (depth * 2); - -- if (!s_partSet[0]) -+ //if (!s_partSet[0]) - { - s_numPartInCUSize = 1 << g_unitSizeDepth; - switch (g_maxLog2CUSize)
View file
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;
View file
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("")]
View file
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("")]
View file
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
View 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
View 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
View 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
View file
HandBrake-0.10.5.tar.bz2/.gitignore
Added
@@ -0,0 +1,26 @@ +# Visual Studio +win/CS/*/bin +win/CS/*/obj +win/CS/*.suo + +# Xcode user data +xcuserdata + +# Build system +build/ +build.*/ +download/ + +# Gtk autoconf spam +gtk/Makefile.in* +gtk/*/Makefile.in* +gtk/aclocal.m4 +gtk/autom4te.cache +gtk/compile +gtk/config.* +gtk/configure +gtk/depcomp +gtk/install-sh +gtk/ltmain.sh +gtk/missing +
View file
HandBrake-0.10.2.tar.bz2/NEWS -> HandBrake-0.10.5.tar.bz2/NEWS
Changed
@@ -1,5 +1,10 @@ NEWS file for HandBrake <http://handbrake.fr/> +Changes between 0.10.2 and 0.10.3 + + - Assorted bug fixes and performance improvements. + + Changes between 0.10.1 and 0.10.2 - Assorted bug fixes and performance improvements.
View file
HandBrake-0.10.2.tar.bz2/contrib/cmake/module.defs -> HandBrake-0.10.5.tar.bz2/contrib/cmake/module.defs
Changed
@@ -1,9 +1,13 @@ $(eval $(call import.MODULE.defs,CMAKE,cmake)) $(eval $(call import.CONTRIB.defs,CMAKE)) -CMAKE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/cmake-3.0.1.tar.gz +CMAKE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/cmake-3.3.2.tar.gz CMAKE.CONFIGURE.deps = CMAKE.CONFIGURE.shared = CMAKE.CONFIGURE.static = CMAKE.CONFIGURE.extra = --no-qt-gui + +ifeq (darwin,$(BUILD.system)) + CMAKE.CONFIGURE.extra += --system-curl +endif
View file
HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/A06-matroskaenc-track-lang.patch
Added
@@ -0,0 +1,15 @@ +diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c +index b39d1b2..d65b6eb 100644 +--- a/libavformat/matroskaenc.c ++++ b/libavformat/matroskaenc.c +@@ -988,7 +988,9 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme + + while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) + if (av_strcasecmp(t->key, "title") && +- av_strcasecmp(t->key, "encoding_tool")) ++ av_strcasecmp(t->key, "encoding_tool") && ++ (elementid != MATROSKA_ID_TAGTARGETS_TRACKUID || ++ av_strcasecmp(t->key, "language"))) + mkv_write_simpletag(s->pb, t); + + end_ebml_master(s->pb, tag);
View file
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;
View file
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) +
View file
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);
View file
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,
View file
HandBrake-0.10.2.tar.bz2/contrib/ffmpeg/module.defs -> HandBrake-0.10.5.tar.bz2/contrib/ffmpeg/module.defs
Changed
@@ -1,4 +1,4 @@ -__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX +__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME ifeq (1,$(FEATURE.qsv)) __deps__ += PTHREADW32 LIBMFX endif @@ -28,11 +28,13 @@ --disable-network \ --disable-hwaccels \ --disable-encoders \ + --enable-libmp3lame \ --enable-encoder=aac \ --enable-encoder=ac3 \ --enable-encoder=flac \ --enable-encoder=mpeg2video \ --enable-encoder=mpeg4 \ + --enable-encoder=libmp3lame \ --enable-libvpx \ --enable-encoder=libvpx_vp8 \ --disable-decoder=libvpx_vp8 \
View file
HandBrake-0.10.2.tar.bz2/contrib/x265/module.defs -> HandBrake-0.10.5.tar.bz2/contrib/x265/module.defs
Changed
@@ -2,14 +2,14 @@ $(eval $(call import.MODULE.defs,X265,x265,$(__deps__))) $(eval $(call import.CONTRIB.defs,X265)) -X265.FETCH.url = http://download.handbrake.fr/contrib/x265-9329-0d30d2641875-1.5.tar.bz2 +X265.FETCH.url = http://download.handbrake.fr/contrib/x265_1.9.tar.gz X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" X265.CONFIGURE.deps = X265.CONFIGURE.static = X265.CONFIGURE.shared = -DENABLE_SHARED=OFF -X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF +X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF -DENABLE_LIBNUMA=OFF ifeq (1,$(BUILD.cross)) ifeq (mingw,$(BUILD.system))
View file
HandBrake-0.10.2.tar.bz2/doc/texi/Building.linux.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/Building.linux.texi
Changed
@@ -33,7 +33,7 @@ Ubuntu 14.04 packages: @itemize @bullet -@item subversion (cli/gui) +@item git (cli/gui) @item cmake (cli/gui) @item yasm (cli/gui) @item build-essential (cli/gui) @@ -66,7 +66,7 @@ To install these packages: @example -sudo apt-get install subversion cmake yasm build-essential autoconf libtool \ +sudo apt-get install git cmake yasm build-essential autoconf libtool \ zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \ libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \ libfontconfig1-dev libass-dev libmp3lame-dev libx264-dev intltool \
View file
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
@@ -20,10 +20,10 @@ @set HB-version-hex __HB_version_hex @set HB-build __HB_build @set HB-repo-url __HB_repo_url -@set HB-repo-root __HB_repo_root @set HB-repo-branch __HB_repo_branch -@set HB-repo-uuid __HB_repo_uuid +@set HB-repo-tag __HB_repo_tag @set HB-repo-rev __HB_repo_rev +@set HB-repo-hash __HB_repo_hash @set HB-repo-date __HB_repo_date @set HB-repo-official __HB_repo_official @set HB-repo-type __HB_repo_type
View file
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
@@ -1,10 +1,10 @@ @appendix Project Repository Details @example url: @value{HB-repo-url} -root: @value{HB-repo-root} branch: @value{HB-repo-branch} -uuid: @value{HB-repo-uuid} +tag: @value{HB-repo-tag} rev: @value{HB-repo-rev} +hash: @value{HB-repo-hash} date: @value{HB-repo-date} type: @value{HB-repo-type} @end example
View file
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
@@ -62,7 +62,7 @@ @itemize @item configure with different options -@item subversion working dir is updated and you want configure to re-evaluate working dir metadata. +@item git working dir is updated and you want configure to re-evaluate working dir metadata. @item build corruption is suspected @end itemize
View file
HandBrake-0.10.2.tar.bz2/doc/texi/building/command.texi -> HandBrake-0.10.5.tar.bz2/doc/texi/building/command.texi
Changed
@@ -1,4 +1,4 @@ @macro COMMAND-checkout{} -svn checkout @value{HB-repo-url} @value{HB-acro-lower}-@value{HB-repo-branch} +git clone @value{HB-repo-url} @value{HB-acro-lower}-@value{HB-repo-branch} cd @value{HB-acro-lower}-@value{HB-repo-branch} @end macro
View file
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
@@ -1,7 +1,7 @@ The following general tools are used on various platforms and it is recommended you use these versions or similar: @itemize @bullet -@item subversion - 1.6.16 +@item git - 2.4.3 @item python - Python 2.7.1 @item curl - curl 7.21.4 (or wget) @item m4 - GNU M4 1.4.6
View file
HandBrake-0.10.2.tar.bz2/gtk/po/LINGUAS -> HandBrake-0.10.5.tar.bz2/gtk/po/LINGUAS
Changed
@@ -13,4 +13,5 @@ ro_RO ru th +zh_CN
View file
HandBrake-0.10.2.tar.bz2/gtk/po/cs.po -> HandBrake-0.10.5.tar.bz2/gtk/po/cs.po
Changed
@@ -428,9 +428,9 @@ msgstr "O programu HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Autorské právo © 2008 - 2013 John Stebbins\nAutorské právo © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Autorské právo © 2008 - 2016 John Stebbins\nAutorské právo © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/da.po -> HandBrake-0.10.5.tar.bz2/gtk/po/da.po
Changed
@@ -424,8 +424,8 @@ msgstr "" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" msgstr "" msgid ""
View file
HandBrake-0.10.2.tar.bz2/gtk/po/de.po -> HandBrake-0.10.5.tar.bz2/gtk/po/de.po
Changed
@@ -425,9 +425,9 @@ msgstr "Über HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake-Entwickler" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake-Entwickler" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/es.po -> HandBrake-0.10.5.tar.bz2/gtk/po/es.po
Changed
@@ -425,9 +425,9 @@ msgstr "Acerca de HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/fr.po -> HandBrake-0.10.5.tar.bz2/gtk/po/fr.po
Changed
@@ -429,9 +429,9 @@ msgstr "A propos d'HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/it_IT.po -> HandBrake-0.10.5.tar.bz2/gtk/po/it_IT.po
Changed
@@ -425,8 +425,8 @@ msgstr "Info su HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" msgstr "" msgid ""
View file
HandBrake-0.10.2.tar.bz2/gtk/po/ja_JP.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ja_JP.po
Changed
@@ -423,8 +423,8 @@ msgstr "HandBrake について" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" msgstr "" msgid ""
View file
HandBrake-0.10.2.tar.bz2/gtk/po/ko.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ko.po
Changed
@@ -424,9 +424,9 @@ msgstr "HandBrake 정보" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/no.po -> HandBrake-0.10.5.tar.bz2/gtk/po/no.po
Changed
@@ -424,9 +424,9 @@ msgstr "Om HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Kopibeskyttet © 2008 - 2013 John Stebbins\nKopibeskyttet © 2004 - 2013 HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Kopibeskyttet © 2008 - 2016 John Stebbins\nKopibeskyttet © 2004 - 2016 HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/pt_BR.po -> HandBrake-0.10.5.tar.bz2/gtk/po/pt_BR.po
Changed
@@ -424,9 +424,9 @@ msgstr "Sobre HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008-2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008-2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/ro_RO.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ro_RO.po
Changed
@@ -424,9 +424,9 @@ msgstr "Despre Handbrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/ru.po -> HandBrake-0.10.5.tar.bz2/gtk/po/ru.po
Changed
@@ -426,9 +426,9 @@ msgstr "О программе" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
HandBrake-0.10.2.tar.bz2/gtk/po/th.po -> HandBrake-0.10.5.tar.bz2/gtk/po/th.po
Changed
@@ -425,9 +425,9 @@ msgstr "เกี่ยวกับ HandBrake" msgid "" -"Copyright © 2008 - 2013 John Stebbins\n" -"Copyright © 2004 - 2013, HandBrake Devs" -msgstr "สงวนลิขสิทธิ์ © 2008 - 2013 John Stebbins\nสงวนลิขสิทธิ์ © 2004 - 2013, HandBrake Devs" +"Copyright © 2008 - 2016 John Stebbins\n" +"Copyright © 2004 - 2016, HandBrake Devs" +msgstr "สงวนลิขสิทธิ์ © 2008 - 2016 John Stebbins\nสงวนลิขสิทธิ์ © 2004 - 2016, HandBrake Devs" msgid "" "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
View file
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 "<small>Passthrough</small>" +msgstr "<small>通过</small>" + +#, 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 "" +"<b>Audio Quality:</b>\n" +"For encoders that support it, adjust the quality of the output." +msgstr "" +"<b>音质：</b>\n" +"调节输出视频的音频质量，需要编码器支持。" + +msgid "Set the mixdown of the output audio track." +msgstr "设置输出音轨的混音。" + +msgid "Set the sample rate of the output audio track." +msgstr "设置输出音轨的采样率。" + +msgid "" +"<b>Audio Gain:</b>\n" +"Adjust the amplification or attenuation of the output audio track." +msgstr "" +"<b>音频增益：</b>\n" +"调节输出音轨的增益。" + +msgid "0dB" +msgstr "0dB" + +msgid "%ddB" +msgstr "%ddB" + +msgid "%.4gkHz" +msgstr "%.4gkHz" + +msgid "<small>%d - %s (%.4gkHz)</small>" +msgstr "<small>%d - %s (%.4gkHz)</small>" + +msgid "" +"<b>Dynamic Range Compression:</b>\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>动态范围压缩：<\\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" +
View file
HandBrake-0.10.2.tar.bz2/gtk/src/appcast.c -> HandBrake-0.10.5.tar.bz2/gtk/src/appcast.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * appcast.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * appcast.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. + * + * appcast.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. */ #include <stdio.h>
View file
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_
View file
HandBrake-0.10.2.tar.bz2/gtk/src/audiohandler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/audiohandler.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * audiohandler.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * audiohandler.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. + * + * audiohandler.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. */ #include <glib/gi18n.h>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/audiohandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/audiohandler.h
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * audiohandler.h - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * audiohandler.h is free software. * @@ -10,7 +10,7 @@ * Foundation; either version 2 of the License, or (at your option) * any later version. * - * callbacks.h is distributed in the hope that it will be useful, + * audiohandler.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.
View file
HandBrake-0.10.2.tar.bz2/gtk/src/callbacks.c -> HandBrake-0.10.5.tar.bz2/gtk/src/callbacks.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * callbacks.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * callbacks.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. + * + * callbacks.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H
View file
HandBrake-0.10.2.tar.bz2/gtk/src/callbacks.h -> HandBrake-0.10.5.tar.bz2/gtk/src/callbacks.h
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * callbacks.h - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * callbacks.h is free software. *
View file
HandBrake-0.10.2.tar.bz2/gtk/src/composite_example.c -> HandBrake-0.10.5.tar.bz2/gtk/src/composite_example.c
Changed
@@ -1,3 +1,26 @@ +/* + * compositor_example.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * compositor_example.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. + * + * compositor_example.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. + */ + #include <gtk/gtk.h> #include "ghbcompositor.h"
View file
HandBrake-0.10.2.tar.bz2/gtk/src/create_resources.c -> HandBrake-0.10.5.tar.bz2/gtk/src/create_resources.c
Changed
@@ -1,3 +1,26 @@ +/* + * create_resources.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * create_resources.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. + * + * create_resources.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. + */ + #include <stdlib.h> #include <stdio.h> #include <unistd.h>
View file
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)
View file
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_)
View file
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>
View file
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>
View file
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__
View file
HandBrake-0.10.2.tar.bz2/gtk/src/ghbcompat.h -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcompat.h
Changed
@@ -1,3 +1,26 @@ +/* + * ghbcompat.h + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * ghbcompat.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. + * + * ghbcompat.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. + */ + #if !defined(_GHB_COMPAT_H_) #define _GHB_COMPAT_H_
View file
HandBrake-0.10.2.tar.bz2/gtk/src/ghbcompositor.c -> HandBrake-0.10.5.tar.bz2/gtk/src/ghbcompositor.c
Changed
@@ -25,6 +25,29 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +/* + * ghbcompositor.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * compositor.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. + * + * ghbcompositor.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. + */ + #include <config.h> #include <stdlib.h> #include "ghbcompat.h"
View file
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__
View file
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>
View file
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_)
View file
HandBrake-0.10.2.tar.bz2/gtk/src/icons.c -> HandBrake-0.10.5.tar.bz2/gtk/src/icons.c
Changed
@@ -1,3 +1,26 @@ +/* + * icons.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * icons.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. + * + * icons.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. + */ + #include "ghbcompat.h" #include "values.h" #include "resources.h"
View file
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_
View file
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
@@ -1,3 +1,26 @@ +/* + * ini_to_plist.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * ini_to_plist.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. + * + * ini_to_plist.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 callbacks.h. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. + */ + #include <glib.h> #include <glib-object.h> #include <glib/gstdio.h>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/main.c -> HandBrake-0.10.5.tar.bz2/gtk/src/main.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * main.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * main.c is free software. *
View file
HandBrake-0.10.2.tar.bz2/gtk/src/marshalers.c -> HandBrake-0.10.5.tar.bz2/gtk/src/marshalers.c
Changed
@@ -1,3 +1,25 @@ +/* + * marshalers.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * marshalers.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. + * + * marshalers.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-object.h>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/marshalers.h -> HandBrake-0.10.5.tar.bz2/gtk/src/marshalers.h
Changed
@@ -1,3 +1,25 @@ +/* + * marshalers.h + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * marshalers.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. + * + * marshalers.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_marshal_MARSHAL_H__ #define __ghb_marshal_MARSHAL_H__
View file
HandBrake-0.10.2.tar.bz2/gtk/src/plist.c -> HandBrake-0.10.5.tar.bz2/gtk/src/plist.c
Changed
@@ -1,3 +1,26 @@ +/* + * plist.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * plist.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. + * + * plist.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 <stdio.h> #include <stdlib.h> #include <fcntl.h>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/plist.h -> HandBrake-0.10.5.tar.bz2/gtk/src/plist.h
Changed
@@ -1,3 +1,26 @@ +/* + * plist.h + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * plist.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. + * + * plist.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. + */ + #if !defined(_PLIST_H_) #define _PLIST_H_
View file
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;
View file
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_
View file
HandBrake-0.10.2.tar.bz2/gtk/src/preview.c -> HandBrake-0.10.5.tar.bz2/gtk/src/preview.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * preview.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * preview.c is free software. * @@ -10,7 +10,18 @@ * Foundation; either version 2 of the License, or (at your option) * any later version. * + * preview.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 <unistd.h> #include <glib.h> #include <glib/gstdio.h>
View file
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_
View file
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;
View file
HandBrake-0.10.2.tar.bz2/gtk/src/queuehandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/queuehandler.h
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * queuehandler.h - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * queuehandler.h is free software. * @@ -10,7 +10,7 @@ * Foundation; either version 2 of the License, or (at your option) * any later version. * - * callbacks.h is distributed in the hope that it will be useful, + * queuehandler.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.
View file
HandBrake-0.10.2.tar.bz2/gtk/src/quotestring.c -> HandBrake-0.10.5.tar.bz2/gtk/src/quotestring.c
Changed
@@ -1,3 +1,26 @@ +/* + * quotestring.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * quotestring.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. + * + * quotestring.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 <stdio.h> #include <string.h> #include <libgen.h>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/renderer_button.c -> HandBrake-0.10.5.tar.bz2/gtk/src/renderer_button.c
Changed
@@ -1,3 +1,26 @@ +/* + * render_button.c + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * render_button.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. + * + * render_button.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 "marshalers.h" #include "renderer_button.h"
View file
HandBrake-0.10.2.tar.bz2/gtk/src/renderer_button.h -> HandBrake-0.10.5.tar.bz2/gtk/src/renderer_button.h
Changed
@@ -1,3 +1,26 @@ +/* + * render_button.h + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> + * + * render_button.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. + * + * render_button.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 _RENDERER_BUTTON_H_ #define _RENDERER_BUTTON_H_
View file
HandBrake-0.10.2.tar.bz2/gtk/src/resources.c -> HandBrake-0.10.5.tar.bz2/gtk/src/resources.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * resources.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * resources.c is free software. * @@ -10,7 +10,18 @@ * Foundation; either version 2 of the License, or (at your option) * any later version. * + * resources.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> #include <glib-object.h> #include <glib/gstdio.h>
View file
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_
View file
HandBrake-0.10.2.tar.bz2/gtk/src/settings.c -> HandBrake-0.10.5.tar.bz2/gtk/src/settings.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * settings.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * settings.c is free software. * @@ -10,7 +10,18 @@ * Foundation; either version 2 of the License, or (at your option) * any later version. * + * settings.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 <fcntl.h> #include <unistd.h> #include <glib.h>
View file
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_
View file
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,
View file
HandBrake-0.10.2.tar.bz2/gtk/src/subtitlehandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/subtitlehandler.h
Changed
@@ -1,16 +1,16 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * subtitlehandler.h - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * - * audiohandler.h is free software. + * subtitlehandler.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. * - * callbacks.h is distributed in the hope that it will be useful, + * subtitlehandler.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.
View file
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>
View file
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_
View file
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>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/videohandler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/videohandler.h
Changed
@@ -1,16 +1,16 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* - * audiohandler.h - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * videohandler.h + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * - * audiohandler.h is free software. + * videohandler.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. * - * callbacks.h is distributed in the hope that it will be useful, + * videohandler.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.
View file
HandBrake-0.10.2.tar.bz2/gtk/src/x264handler.c -> HandBrake-0.10.5.tar.bz2/gtk/src/x264handler.c
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * x264handler.c - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * x264handler.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. + * + * x264handler.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>
View file
HandBrake-0.10.2.tar.bz2/gtk/src/x264handler.h -> HandBrake-0.10.5.tar.bz2/gtk/src/x264handler.h
Changed
@@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ /* * x264handler.h - * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins> + * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins> * * x264handler.h is free software. * @@ -10,7 +10,7 @@ * Foundation; either version 2 of the License, or (at your option) * any later version. * - * callbacks.h is distributed in the hope that it will be useful, + * x264handler.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/audio_remap.c -> HandBrake-0.10.5.tar.bz2/libhb/audio_remap.c
Changed
@@ -1,6 +1,6 @@ /* audio_remap.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/audio_remap.h -> HandBrake-0.10.5.tar.bz2/libhb/audio_remap.h
Changed
@@ -1,6 +1,6 @@ /* audio_remap.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/audio_resample.c -> HandBrake-0.10.5.tar.bz2/libhb/audio_resample.c
Changed
@@ -1,6 +1,6 @@ /* audio_resample.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/audio_resample.h -> HandBrake-0.10.5.tar.bz2/libhb/audio_resample.h
Changed
@@ -1,6 +1,6 @@ /* audio_resample.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/batch.c -> HandBrake-0.10.5.tar.bz2/libhb/batch.c
Changed
@@ -1,6 +1,6 @@ /* batch.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/bd.c -> HandBrake-0.10.5.tar.bz2/libhb/bd.c
Changed
@@ -1,6 +1,6 @@ /* dvd.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/bits.h -> HandBrake-0.10.5.tar.bz2/libhb/bits.h
Changed
@@ -1,6 +1,6 @@ /* bits.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/colormap.c -> HandBrake-0.10.5.tar.bz2/libhb/colormap.c
Changed
@@ -1,6 +1,6 @@ /* colormap.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/colormap.h -> HandBrake-0.10.5.tar.bz2/libhb/colormap.h
Changed
@@ -1,6 +1,6 @@ /* colormap.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/common.c -> HandBrake-0.10.5.tar.bz2/libhb/common.c
Changed
@@ -1,6 +1,6 @@ /* common.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/common.h -> HandBrake-0.10.5.tar.bz2/libhb/common.h
Changed
@@ -1,6 +1,6 @@ /* common.h - 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. @@ -1147,7 +1147,6 @@ extern hb_work_object_t hb_decavcodeca; extern hb_work_object_t hb_decavcodecv; extern hb_work_object_t hb_declpcm; -extern hb_work_object_t hb_enclame; extern hb_work_object_t hb_encvorbis; extern hb_work_object_t hb_muxer; extern hb_work_object_t hb_encca_aac;
View file
HandBrake-0.10.2.tar.bz2/libhb/cropscale.c -> HandBrake-0.10.5.tar.bz2/libhb/cropscale.c
Changed
@@ -1,6 +1,6 @@ /* cropscale.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. @@ -202,6 +202,12 @@ pv->pix_fmt = in->f.fmt; } + if (pv->context == NULL) + { + hb_buffer_close(&out); + return NULL; + } + // Scale pic_crop into pic_render according to the // context set up above sws_scale(pv->context,
View file
HandBrake-0.10.2.tar.bz2/libhb/deblock.c -> HandBrake-0.10.5.tar.bz2/libhb/deblock.c
Changed
@@ -1,5 +1,5 @@ /* - Copyright (C) 2005 Michael Niedermayer <michaelni@gmx.at> + Copyright (C) 2005-2016 Michael Niedermayer <michaelni@gmx.at> 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
View file
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 ) {
View file
HandBrake-0.10.2.tar.bz2/libhb/deccc608sub.c -> HandBrake-0.10.5.tar.bz2/libhb/deccc608sub.c
Changed
@@ -1,6 +1,6 @@ /* deccc608sub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/deccc608sub.h -> HandBrake-0.10.5.tar.bz2/libhb/deccc608sub.h
Changed
@@ -1,6 +1,6 @@ /* deccc608sub.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/declpcm.c -> HandBrake-0.10.5.tar.bz2/libhb/declpcm.c
Changed
@@ -1,6 +1,6 @@ /* declpcm.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/decomb.c -> HandBrake-0.10.5.tar.bz2/libhb/decomb.c
Changed
@@ -1,6 +1,6 @@ /* decomb.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/decpgssub.c -> HandBrake-0.10.5.tar.bz2/libhb/decpgssub.c
Changed
@@ -1,6 +1,6 @@ /* decpgssub.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.
View file
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
View file
HandBrake-0.10.2.tar.bz2/libhb/decsrtsub.h -> HandBrake-0.10.5.tar.bz2/libhb/decsrtsub.h
Changed
@@ -1,6 +1,6 @@ /* decsrtsub.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/decssasub.c -> HandBrake-0.10.5.tar.bz2/libhb/decssasub.c
Changed
@@ -1,6 +1,6 @@ /* decssasub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/decssasub.h -> HandBrake-0.10.5.tar.bz2/libhb/decssasub.h
Changed
@@ -1,6 +1,6 @@ /* decssasub.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/dectx3gsub.c -> HandBrake-0.10.5.tar.bz2/libhb/dectx3gsub.c
Changed
@@ -1,6 +1,6 @@ /* dectx3gsub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/decutf8sub.c -> HandBrake-0.10.5.tar.bz2/libhb/decutf8sub.c
Changed
@@ -1,6 +1,6 @@ /* decutf8sub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/decvobsub.c -> HandBrake-0.10.5.tar.bz2/libhb/decvobsub.c
Changed
@@ -1,6 +1,6 @@ /* decvobsub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/deinterlace.c -> HandBrake-0.10.5.tar.bz2/libhb/deinterlace.c
Changed
@@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Michael Niedermayer <michaelni@gmx.at> + Copyright (C) 2006-2016 Michael Niedermayer <michaelni@gmx.at> 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
View file
HandBrake-0.10.2.tar.bz2/libhb/demuxmpeg.c -> HandBrake-0.10.5.tar.bz2/libhb/demuxmpeg.c
Changed
@@ -1,6 +1,6 @@ /* demuxmpeg.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/denoise.c -> HandBrake-0.10.5.tar.bz2/libhb/denoise.c
Changed
@@ -1,6 +1,6 @@ /* - Copyright (c) 2003 Daniel Moreno <comac AT comac DOT darktech DOT org> - Copyright (c) 2012 Loren Merritt + Copyright (c) 2003-2016 Daniel Moreno <comac AT comac DOT darktech DOT org> + Copyright (c) 2012-2016 Loren Merritt 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
View file
HandBrake-0.10.2.tar.bz2/libhb/detelecine.c -> HandBrake-0.10.5.tar.bz2/libhb/detelecine.c
Changed
@@ -1,6 +1,6 @@ /* detelecine.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/dvd.c -> HandBrake-0.10.5.tar.bz2/libhb/dvd.c
Changed
@@ -1,6 +1,6 @@ /* dvd.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/dvd.h -> HandBrake-0.10.5.tar.bz2/libhb/dvd.h
Changed
@@ -1,6 +1,6 @@ /* dvd.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/dvdnav.c -> HandBrake-0.10.5.tar.bz2/libhb/dvdnav.c
Changed
@@ -1,6 +1,6 @@ /* dvdnav.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/dxva2api.c -> HandBrake-0.10.5.tar.bz2/libhb/dxva2api.c
Changed
@@ -1,6 +1,6 @@ /* dxva2api.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/dxva2api.h -> HandBrake-0.10.5.tar.bz2/libhb/dxva2api.h
Changed
@@ -1,6 +1,6 @@ /* dxva2api.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/eedi2.c -> HandBrake-0.10.5.tar.bz2/libhb/eedi2.c
Changed
@@ -1,6 +1,6 @@ /* eedi2.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/eedi2.h -> HandBrake-0.10.5.tar.bz2/libhb/eedi2.h
Changed
@@ -1,6 +1,6 @@ /* eedi2.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/enc_qsv.c -> HandBrake-0.10.5.tar.bz2/libhb/enc_qsv.c
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/encavcodec.c -> HandBrake-0.10.5.tar.bz2/libhb/encavcodec.c
Changed
@@ -1,6 +1,6 @@ /* encavcodec.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/encavcodecaudio.c -> HandBrake-0.10.5.tar.bz2/libhb/encavcodecaudio.c
Changed
@@ -1,6 +1,6 @@ /* encavcodecaudio.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. @@ -115,6 +115,10 @@ } break; + case HB_ACODEC_LAME: + codec_name = "libmp3lame"; + break; + default: hb_error("encavcodecaInit: unsupported codec (0x%x)", audio->config.out.codec);
View file
HandBrake-0.10.2.tar.bz2/libhb/enctheora.c -> HandBrake-0.10.5.tar.bz2/libhb/enctheora.c
Changed
@@ -1,6 +1,6 @@ /* enctheora.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/encvobsub.c -> HandBrake-0.10.5.tar.bz2/libhb/encvobsub.c
Changed
@@ -1,6 +1,6 @@ /* encvobsub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/encvorbis.c -> HandBrake-0.10.5.tar.bz2/libhb/encvorbis.c
Changed
@@ -1,6 +1,6 @@ /* encvorbis.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/encx264.c -> HandBrake-0.10.5.tar.bz2/libhb/encx264.c
Changed
@@ -1,6 +1,6 @@ /* encx264.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/encx264.h -> HandBrake-0.10.5.tar.bz2/libhb/encx264.h
Changed
@@ -1,6 +1,6 @@ /* encx264.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/encx265.c -> HandBrake-0.10.5.tar.bz2/libhb/encx265.c
Changed
@@ -1,6 +1,6 @@ /* encx265.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. @@ -279,6 +279,9 @@ job->areBframes = (param->bframes > 0) + (param->bframes > 0 && param->bBPyramid > 0); + /* Reset global variables before opening a new encoder */ + x265_cleanup(); + pv->x265 = x265_encoder_open(param); if (pv->x265 == NULL) {
View file
HandBrake-0.10.2.tar.bz2/libhb/fifo.c -> HandBrake-0.10.5.tar.bz2/libhb/fifo.c
Changed
@@ -1,6 +1,6 @@ /* fifo.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/h264_common.h -> HandBrake-0.10.5.tar.bz2/libhb/h264_common.h
Changed
@@ -1,6 +1,6 @@ /* h264_common.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/h265_common.h -> HandBrake-0.10.5.tar.bz2/libhb/h265_common.h
Changed
@@ -1,6 +1,6 @@ /* h265_common.h - 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.
View file
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 );
View file
HandBrake-0.10.2.tar.bz2/libhb/hb.h -> HandBrake-0.10.5.tar.bz2/libhb/hb.h
Changed
@@ -1,6 +1,6 @@ /* hb.h - 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. @@ -29,7 +29,8 @@ hb_handle_t * hb_init_dl ( int verbose, int update_check ); // hb_init for use with dylib /* hb_get_version() */ -char * hb_get_version( hb_handle_t * ); +const char * hb_get_full_description(); +const char * hb_get_version( hb_handle_t * ); int hb_get_build( hb_handle_t * ); /* hb_check_update()
View file
HandBrake-0.10.2.tar.bz2/libhb/hb_dict.c -> HandBrake-0.10.5.tar.bz2/libhb/hb_dict.c
Changed
@@ -1,6 +1,6 @@ /* hb_dict.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/hb_dict.h -> HandBrake-0.10.5.tar.bz2/libhb/hb_dict.h
Changed
@@ -1,6 +1,6 @@ /* hb_dict.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/hbffmpeg.h -> HandBrake-0.10.5.tar.bz2/libhb/hbffmpeg.h
Changed
@@ -1,6 +1,6 @@ /* hbffmpeg.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/internal.h -> HandBrake-0.10.5.tar.bz2/libhb/internal.h
Changed
@@ -1,6 +1,6 @@ /* internal.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/lang.c -> HandBrake-0.10.5.tar.bz2/libhb/lang.c
Changed
@@ -1,6 +1,6 @@ /* lang.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/lang.h -> HandBrake-0.10.5.tar.bz2/libhb/lang.h
Changed
@@ -1,6 +1,6 @@ /* lang.h - 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.
View file
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);
View file
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);
View file
HandBrake-0.10.2.tar.bz2/libhb/nal_units.c -> HandBrake-0.10.5.tar.bz2/libhb/nal_units.c
Changed
@@ -1,6 +1,6 @@ /* nal_units.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/nal_units.h -> HandBrake-0.10.5.tar.bz2/libhb/nal_units.h
Changed
@@ -1,6 +1,6 @@ /* nal_units.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/nlmeans.c -> HandBrake-0.10.5.tar.bz2/libhb/nlmeans.c
Changed
@@ -1,7 +1,7 @@ /* nlmeans.c - Copyright (c) 2013 Dirk Farin - Copyright (c) 2003-2014 HandBrake Team + Copyright (c) 2013-2016 Dirk Farin + 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/oclnv12toyuv.c -> HandBrake-0.10.5.tar.bz2/libhb/oclnv12toyuv.c
Changed
@@ -1,6 +1,6 @@ /* oclnv12toyuv.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/oclnv12toyuv.h -> HandBrake-0.10.5.tar.bz2/libhb/oclnv12toyuv.h
Changed
@@ -1,6 +1,6 @@ /* oclnv12toyuv.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/oclscale.c -> HandBrake-0.10.5.tar.bz2/libhb/oclscale.c
Changed
@@ -1,6 +1,6 @@ /* oclscale.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/opencl.c -> HandBrake-0.10.5.tar.bz2/libhb/opencl.c
Changed
@@ -1,6 +1,6 @@ /* opencl.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/opencl.h -> HandBrake-0.10.5.tar.bz2/libhb/opencl.h
Changed
@@ -1,6 +1,6 @@ /* opencl.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/openclkernels.h -> HandBrake-0.10.5.tar.bz2/libhb/openclkernels.h
Changed
@@ -1,6 +1,6 @@ /* openclkernels.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/openclwrapper.c -> HandBrake-0.10.5.tar.bz2/libhb/openclwrapper.c
Changed
@@ -1,6 +1,6 @@ /* openclwrapper.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. @@ -668,6 +668,7 @@ } isInited = 0; + useBuffers = 0; gpu_info->isUserCreated = 0; return 1;
View file
HandBrake-0.10.2.tar.bz2/libhb/openclwrapper.h -> HandBrake-0.10.5.tar.bz2/libhb/openclwrapper.h
Changed
@@ -1,6 +1,6 @@ /* openclwrapper.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/param.c -> HandBrake-0.10.5.tar.bz2/libhb/param.c
Changed
@@ -1,6 +1,6 @@ /* param.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/ports.c -> HandBrake-0.10.5.tar.bz2/libhb/ports.c
Changed
@@ -1,6 +1,6 @@ /* ports.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/ports.h -> HandBrake-0.10.5.tar.bz2/libhb/ports.h
Changed
@@ -1,6 +1,6 @@ /* ports.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/project.h.m4 -> HandBrake-0.10.5.tar.bz2/libhb/project.h.m4
Changed
@@ -21,12 +21,14 @@ <<#>>define HB_PROJECT_VERSION_HEX 0x<<>>__HB_version_hex<<>>LL <<#>>define HB_PROJECT_BUILD __HB_build <<#>>define HB_PROJECT_REPO_URL "__HB_repo_url" -<<#>>define HB_PROJECT_REPO_ROOT "__HB_repo_root" -<<#>>define HB_PROJECT_REPO_UUID "__HB_repo_uuid" +<<#>>define HB_PROJECT_REPO_TAG "__HB_repo_tag" <<#>>define HB_PROJECT_REPO_REV __HB_repo_rev -<<#>>define HB_PROJECT_REPO_DATE "__HB_repo_date" -<<#>>define HB_PROJECT_REPO_OFFICIAL __HB_repo_official +<<#>>define HB_PROJECT_REPO_HASH "__HB_repo_hash" +<<#>>define HB_PROJECT_REPO_BRANCH "__HB_repo_branch" +<<#>>define HB_PROJECT_REPO_REMOTE "__HB_repo_remote" <<#>>define HB_PROJECT_REPO_TYPE "__HB_repo_type" +<<#>>define HB_PROJECT_REPO_OFFICIAL __HB_repo_official +<<#>>define HB_PROJECT_REPO_DATE "__HB_repo_date" <<#>>define HB_PROJECT_BUILD_SPEC "__BUILD_spec" <<#>>define HB_PROJECT_BUILD_MACHINE "__BUILD_machine"
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_common.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_common.c
Changed
@@ -1,6 +1,6 @@ /* qsv_common.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_common.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_common.h
Changed
@@ -1,6 +1,6 @@ /* qsv_common.h * - * 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_filter.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter.c
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_filter.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter.h
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_filter_pp.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter_pp.c
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_filter_pp.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_filter_pp.h
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_memory.c -> HandBrake-0.10.5.tar.bz2/libhb/qsv_memory.c
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/qsv_memory.h -> HandBrake-0.10.5.tar.bz2/libhb/qsv_memory.h
Changed
@@ -1,6 +1,6 @@ /* ********************************************************************* *\ -Copyright (C) 2013 Intel Corporation. All rights reserved. +Copyright (C) 2013-2016 Intel Corporation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
View file
HandBrake-0.10.2.tar.bz2/libhb/reader.c -> HandBrake-0.10.5.tar.bz2/libhb/reader.c
Changed
@@ -1,6 +1,6 @@ /* reader.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/rendersub.c -> HandBrake-0.10.5.tar.bz2/libhb/rendersub.c
Changed
@@ -1,6 +1,6 @@ /* rendersub.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/rotate.c -> HandBrake-0.10.5.tar.bz2/libhb/rotate.c
Changed
@@ -1,6 +1,6 @@ /* rorate.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/scan.c -> HandBrake-0.10.5.tar.bz2/libhb/scan.c
Changed
@@ -1,6 +1,6 @@ /* scan.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/stream.c -> HandBrake-0.10.5.tar.bz2/libhb/stream.c
Changed
@@ -1,6 +1,6 @@ /* stream.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.
View file
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; } /***********************************************************************
View file
HandBrake-0.10.2.tar.bz2/libhb/taskset.c -> HandBrake-0.10.5.tar.bz2/libhb/taskset.c
Changed
@@ -1,6 +1,6 @@ /* taskset.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/taskset.h -> HandBrake-0.10.5.tar.bz2/libhb/taskset.h
Changed
@@ -1,6 +1,6 @@ /* taskset.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/update.c -> HandBrake-0.10.5.tar.bz2/libhb/update.c
Changed
@@ -1,6 +1,6 @@ /* update.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/vadxva2.c -> HandBrake-0.10.5.tar.bz2/libhb/vadxva2.c
Changed
@@ -1,6 +1,6 @@ /* vadxva2.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.
View file
HandBrake-0.10.2.tar.bz2/libhb/vadxva2.h -> HandBrake-0.10.5.tar.bz2/libhb/vadxva2.h
Changed
@@ -1,6 +1,6 @@ /* vadxva2.h - 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.
View file
HandBrake-0.10.2.tar.bz2/libhb/vfr.c -> HandBrake-0.10.5.tar.bz2/libhb/vfr.c
Changed
@@ -1,6 +1,6 @@ /* vfr.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.
View file
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 ); }
View file
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"]; }
View file
HandBrake-0.10.2.tar.bz2/macosx/HBOutputRedirect.m -> HandBrake-0.10.5.tar.bz2/macosx/HBOutputRedirect.m
Changed
@@ -185,7 +185,10 @@ - (void)forwardOutput:(NSData *)data { NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - [listeners makeObjectsPerformSelector:forwardingSelector withObject:string]; + if (string) + { + [listeners makeObjectsPerformSelector:forwardingSelector withObject:string]; + } [string release]; }
View file
HandBrake-0.10.2.tar.bz2/macosx/Info.plist.m4 -> HandBrake-0.10.5.tar.bz2/macosx/Info.plist.m4
Changed
@@ -50,7 +50,7 @@ <key>LSMinimumSystemVersion</key> <string>${MACOSX_DEPLOYMENT_TARGET}</string> <key>NSHumanReadableCopyright</key> - <string>Copyright © 2003-2015 __HB_name Developers. + <string>Copyright © 2003-2016 __HB_name Developers. All rights reserved.</string> <key>NSMainNibFile</key> <string>MainMenu</string> @@ -58,5 +58,10 @@ <string>HBApplication</string> <key>SUFeedURL</key> <string>__HB_url_appcast</string> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSAllowsArbitraryLoads</key> + <true/> + </dict> </dict> </plist>
View file
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.
View file
HandBrake-0.10.2.tar.bz2/make/include/tool.defs -> HandBrake-0.10.5.tar.bz2/make/include/tool.defs
Changed
@@ -11,3 +11,4 @@ MV.exe = mv ZIP.exe = zip LN.exe = ln +GIT.exe = git
View file
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. + +
View file
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. + +
View file
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
View file
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
View file
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
View file
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
View file
HandBrake-0.10.2.tar.bz2/pkg/mingw/module.defs -> HandBrake-0.10.5.tar.bz2/pkg/mingw/module.defs
Changed
@@ -1,9 +1,13 @@ -PKG.cli.zip = $(PKG.out/)$(HB.name)-$(HB.version)-$(BUILD.machine)-Win_CLI.zip +PKG.platname = win +PKG.cli.zip = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(BUILD.machine).zip +PKG.libhb.zip = $(PKG.out/)LibHB-$(HB.version)-$(PKG.platname)-$(BUILD.machine).zip PKG.mingw.lib = $(SRC/)libraries STAGE.out.cli/ = $(STAGE.out/)cli/ +STAGE.out.libhb/ = $(STAGE.out/)libhb/ ############################################################################### BUILD.out += $(PKG.cli.zip) +BUILD.out += $(PKG.libhb.zip)
View file
HandBrake-0.10.2.tar.bz2/pkg/mingw/module.rules -> HandBrake-0.10.5.tar.bz2/pkg/mingw/module.rules
Changed
@@ -1,9 +1,12 @@ -pkg.create.zip:: pkg.create $(PKG.cli.zip) +pkg.create.zip:: pkg.create $(PKG.cli.zip) $(PKG.libhb.zip) $(PKG.cli.zip): | $(dir $(PKG.cli.zip)) $(PKG.cli.zip): | $(STAGE.out.cli/) cd $(STAGE.out.cli/) && $(ZIP.exe) -r $(call fn.ABSOLUTE,$(PKG.cli.zip)) . +$(PKG.libhb.zip): | $(dir $(PKG.libhb.zip)) +$(PKG.libhb.zip): | $(STAGE.out.libhb/) + cd $(STAGE.out.libhb/) && $(ZIP.exe) -r $(call fn.ABSOLUTE,$(PKG.libhb.zip)) . $(STAGE.out.cli/): -$(MKDIR.exe) -p $@ @@ -11,4 +14,10 @@ $(CP.exe) -R contrib/etc/fonts $(STAGE.out.cli/)/fonts/ $(call STAGE.doc,$(STAGE.out.cli/)) +$(STAGE.out.libhb/): + -$(MKDIR.exe) -p $@ + $(CP.exe) libhb/hb.dll $(STAGE.out.libhb/) + $(CP.exe) -R contrib/etc/fonts $(STAGE.out.libhb/)/fonts/ + $(call STAGE.doc,$(STAGE.out.libhb/)) +
View file
HandBrake-0.10.2.tar.bz2/pkg/module.defs -> HandBrake-0.10.5.tar.bz2/pkg/module.defs
Changed
@@ -4,7 +4,7 @@ PKG.out/ = $(BUILD/)pkg/ PKG.basename = $(HB.name)-$(HB.version) -PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2 +PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename)-source.tar.bz2 PKG.src-contrib.tar.bz2 = $(PKG.out/)$(PKG.basename)-contrib.tar.bz2 STAGE.out/ = $(BUILD/)stage/
View file
HandBrake-0.10.2.tar.bz2/pkg/module.rules -> HandBrake-0.10.5.tar.bz2/pkg/module.rules
Changed
@@ -17,8 +17,9 @@ $(TAR.exe) cjf $@ -C $(STAGE.out.src/) $(PKG.basename) $(STAGE.out.src/): - 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) -p $@ + $(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $@ + $(SRC/)scripts/repo-info.sh $(SRC/) $(GIT.exe) > $@/$(PKG.basename)/version.txt $(PKG.src-contrib.tar.bz2): $(TAR.exe) cjf $@ -C $(CONTRIB.download/) \
View file
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 "$@"
View file
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 +
View file
HandBrake-0.10.2.tar.bz2/test/module.defs -> HandBrake-0.10.5.tar.bz2/test/module.defs
Changed
@@ -14,8 +14,8 @@ TEST.libs = $(LIBHB.a) 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 \ bluray freetype xml2 bz2 z
View file
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;
View file
HandBrake-0.10.2.tar.bz2/version.txt -> HandBrake-0.10.5.tar.bz2/version.txt
Changed
@@ -1,11 +1,9 @@ -Path: 0.10.2 -URL: svn://svn.handbrake.fr/HandBrake/tags/0.10.2 -Relative URL: ^/tags/0.10.2 -Repository Root: svn://svn.handbrake.fr/HandBrake -Repository UUID: b64f7644-9d1e-0410-96f1-a4d463321fa5 -Revision: 7288 -Node Kind: directory -Last Changed Author: sr55 -Last Changed Rev: 7288 -Last Changed Date: 2015-06-09 21:11:42 +0200 (mar., 09 juin 2015) - +URL=https://github.com/HandBrake/HandBrake.git +HASH=220568537099110b73c0bd29cb8ccb5cc341c3af +SHORTHASH=2205685 +TAG=0.10.5 +TAG_HASH=220568537099110b73c0bd29cb8ccb5cc341c3af +REV=0 +BRANCH= +REMOTE=https://github.com/HandBrake/HandBrake.git +DATE=2016-02-11 20:14:05 +0000
View file
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
@@ -119,6 +119,7 @@ <Compile Include="Model\Subtitle\SubtitleBehaviourModes.cs" /> <Compile Include="Model\Subtitle\SubtitleBehaviours.cs" /> <Compile Include="Model\VideoScaler.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Services\Interfaces\IEncodeServiceWrapper.cs" /> <Compile Include="Services\Interfaces\IHbServiceCallback.cs" /> <Compile Include="Services\Interfaces\IServerService.cs" /> @@ -178,10 +179,6 @@ <None Include="app.config" /> </ItemGroup> <ItemGroup> - <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" /> - <None Include="Properties\AssemblyInfo.cs.tmpl" /> - </ItemGroup> - <ItemGroup> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
View file
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")] +
View file
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
@@ -380,10 +380,10 @@ query += " --denoise=\"weak\""; break; case DenoisePreset.Light: - query += " --nlmeans=\"light\""; + query += " --denoise=\"light\""; break; case DenoisePreset.Ultralight: - query += " --nlmeans=\"ultralight\""; + query += " --denoise=\"ultralight\""; break; case DenoisePreset.Medium: query += " --denoise=\"medium\"";
View file
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
@@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("HandBrake Team")] [assembly: AssemblyProduct("HandBrake.Interop")] -[assembly: AssemblyCopyright("Copyright © 2014 HandBrake Team")] +[assembly: AssemblyCopyright("Copyright © 2016 HandBrake Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]
View file
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
@@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("HandBrake Team")] [assembly: AssemblyProduct("HandBrake.Server")] -[assembly: AssemblyCopyright("Copyright © 2015 HandBrake Team")] +[assembly: AssemblyCopyright("Copyright © 2016 HandBrake Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]
View file
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>
View file
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>
View file
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
@@ -74,7 +74,7 @@ TextReader stdOutput = cliProcess.StandardError; while ((line = stdOutput.ReadLine()) != null) { - Match m = Regex.Match(line, @"HandBrake ([svnM0-9.]*) \(([0-9]*)\)"); + Match m = Regex.Match(line, @"HandBrake ([a-zA-Z0-9.\-]*) \(([0-9]*)\)"); if (m.Success) { string build = m.Groups[2].Success ? m.Groups[2].Value : string.Empty;
View file
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
@@ -8,8 +8,8 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "HandBrake" -!define PRODUCT_VERSION "0.10.2" -!define PRODUCT_VERSION_NUMBER "0.10.2" +!define PRODUCT_VERSION "0.10.5" +!define PRODUCT_VERSION_NUMBER "0.10.5" !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"
View file
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
@@ -8,8 +8,8 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "HandBrake" -!define PRODUCT_VERSION "0.10.2" -!define PRODUCT_VERSION_NUMBER "0.10.2" +!define PRODUCT_VERSION "0.10.5" +!define PRODUCT_VERSION_NUMBER "0.10.5" !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"
View file
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) +)]
View file
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
@@ -61,7 +61,7 @@ } /// <summary> - /// Looks up a localized string similar to Copyright (C) 2003-2015 The HandBrake Team + /// Looks up a localized string similar to Copyright (C) 2003-2016 The HandBrake Team /// ///This program is free software; you can redistribute it and/or ///modify it under the terms of the GNU General Public License
View file
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
@@ -302,7 +302,7 @@ This box allows you to add or modify additional or current parameters as desired. </value> </data> <data name="About_GPL" xml:space="preserve"> - <value>Copyright (C) 2003-2015 The HandBrake Team + <value>Copyright (C) 2003-2016 The HandBrake Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -547,4 +547,4 @@ <value>You cannot overwrite the source file you want to convert. Please choose a different filename.</value> </data> -</root> \ No newline at end of file +</root>
View file
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
View file
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
@@ -915,7 +915,14 @@ { get { - return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; + if (this.SelectedVideoEncoder == VideoEncoder.X264) + { + return string.Format(Resources.Video_EncoderExtraArgs, this.GetActualx264Query()); // "You can provide additional arguments using the standard x264 format"; + } + else + { + return "Pass additional parameters to the encoder."; + } } } @@ -1343,6 +1350,7 @@ { tunes.Add(this.X264Tune.ToString().ToLower().Replace(" ", string.Empty)); // TODO tidy this sillyness up. } + if (this.FastDecode) { tunes.Add("fastdecode");
View file
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}"
View file
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
@@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("HandBrake")] [assembly: AssemblyProduct("HandBrake")] -[assembly: AssemblyCopyright("Copyright © 2012")] +[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -39,4 +39,4 @@ // [assembly: AssemblyVersion("0.9.6.$WCREV$")] -[assembly: NeutralResourcesLanguage("")] \ No newline at end of file +[assembly: NeutralResourcesLanguage("")]
View file
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 @@ <!-- Pre Build Events. You must do a full checkout as it takes the svn from the main directory. $(ProjectDir). is not used. --> <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> <!-- Post Build Events -->
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.