]> granicus.if.org Git - handbrake/commit
Merging trunk to cl branch.
authorsr55 <sr55.hb@outlook.com>
Sat, 2 Feb 2013 15:12:19 +0000 (15:12 +0000)
committersr55 <sr55.hb@outlook.com>
Sat, 2 Feb 2013 15:12:19 +0000 (15:12 +0000)
commita7dfaa518ce3aaf73a64ecc3c61a88c9427aef81
tree8efccea1be99fb4aca2fe1ad028c395095500675
parentbc3b56381c6ac214b7736a00972c9d0902902453
Merging trunk to cl branch.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5234 b64f7644-9d1e-0410-96f1-a4d463321fa5
106 files changed:
contrib/a52dec/A03-automake.patch [new file with mode: 0644]
contrib/automake/module.defs
contrib/ffmpeg/A02-channel-layout-order.patch [deleted file]
contrib/ffmpeg/A02-truehd-channel-order.patch [new file with mode: 0644]
contrib/ffmpeg/A04-dca-resync.patch
contrib/libbluray/A00-automake.patch [new file with mode: 0644]
contrib/libdvdread/P01-mingw-bitfields.patch [new file with mode: 0644]
contrib/libogg/A00-automake.patch [new file with mode: 0644]
contrib/libvorbis/A00-automake.patch [new file with mode: 0644]
contrib/x264/module.defs
contrib/yasm/module.defs
doc/BUILD-Linux
doc/BUILD-Mac
doc/BUILD-MinGW
doc/texi/Building.linux.texi
doc/texi/Building.mingw.texi
doc/texi/Building.osx.texi
gtk/src/audiohandler.c
gtk/src/callbacks.c
gtk/src/ghb.ui
gtk/src/hb-backend.c
gtk/src/main.c
gtk/src/subtitlehandler.c
libhb/common.c
libhb/common.h
libhb/decmpeg2.c
libhb/dvdnav.c
libhb/encx264.c
libhb/encx264.h
libhb/hb.c
libhb/sync.c
libhb/work.c
macosx/Controller.h
macosx/Controller.m
macosx/English.lproj/MainMenu.xib
macosx/English.lproj/PicturePreview.xib
macosx/HBPresets.h
macosx/HBPresets.m
macosx/HBPreviewController.h
macosx/HBPreviewController.m
macosx/HandBrake.xcodeproj/project.pbxproj
macosx/icons/next-p.pdf [new file with mode: 0644]
macosx/icons/pause-p.pdf [new file with mode: 0644]
macosx/icons/play-p.pdf [new file with mode: 0644]
macosx/icons/prev-p.pdf [new file with mode: 0644]
macosx/main.mm
make/configure.py
make/xcodemake
pkg/linux/debian/control.quantal
pkg/linux/debian/rules.natty [new file with mode: 0755]
pkg/linux/debian/rules.oneiric [new file with mode: 0755]
pkg/linux/debian/rules.precise [new file with mode: 0755]
pkg/linux/debian/rules.quantal [new file with mode: 0755]
pkg/linux/module.rules
scripts/manicure.rb
test/test.c
win/CS/HandBrake.ApplicationServices/EventArgs/SettingChangedEventArgs.cs [new file with mode: 0644]
win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs
win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs
win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs
win/CS/HandBrake.ApplicationServices/Services/Encode.cs
win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs
win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs
win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
win/CS/HandBrake.ApplicationServices/Utilities/Win32.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs
win/CS/HandBrakeWPF/Controls/TimeSpanBox.xaml [new file with mode: 0644]
win/CS/HandBrakeWPF/Controls/TimeSpanBox.xaml.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Model/SelectionTitle.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
win/CS/HandBrakeWPF/UserSettingConstants.cs
win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
win/CS/HandBrakeWPF/Views/AddPresetView.xaml.cs
win/CS/HandBrakeWPF/Views/AdvancedView.xaml
win/CS/HandBrakeWPF/Views/AudioView.xaml
win/CS/HandBrakeWPF/Views/ChaptersView.xaml
win/CS/HandBrakeWPF/Views/MainView.xaml
win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml [new file with mode: 0644]
win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Views/QueueView.xaml
win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
win/CS/HandBrakeWPF/Views/TitleSpecificView.xaml
win/CS/HandBrakeWPF/Views/VideoView.xaml
win/CS/HandBrakeWPF/defaultsettings.xml
win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb
win/CS/libraries/WPFDragDrop/SourceModifications.zip