]> granicus.if.org Git - handbrake/commit
Merging Trunk into QSV branch.
authorsr55 <sr55.hb@outlook.com>
Sat, 1 Jun 2013 18:33:26 +0000 (18:33 +0000)
committersr55 <sr55.hb@outlook.com>
Sat, 1 Jun 2013 18:33:26 +0000 (18:33 +0000)
commite1bc0031c8c5aceec25f16a355d663eb9941b9c7
tree392a01c0e52c7a00a01d2abd3d26cc52628dc594
parent02713ba77f582fab3aae71623beb89981579786b
Merging Trunk into QSV branch.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5540 b64f7644-9d1e-0410-96f1-a4d463321fa5
73 files changed:
gtk/src/audiohandler.c
gtk/src/hb-backend.c
gtk/src/hb-backend.h
gtk/src/presets.c
libhb/common.c
libhb/common.h
libhb/cropscale.c
libhb/encavcodec.c
libhb/scan.c
libhb/vfr.c
libhb/work.c
macosx/Controller.m
macosx/HBAudio.m
macosx/HBAudioController.m
macosx/HBPreviewController.m
macosx/HBSubtitles.m
pkg/linux/module.rules
scripts/manicure.rb
test/test.c
win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
win/CS/HandBrake.ApplicationServices/EventArgs/EncodeCompletedEventArgs.cs
win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
win/CS/HandBrake.ApplicationServices/Model/PresetPictureSettingsMode.cs
win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs
win/CS/HandBrake.ApplicationServices/Services/Encode.cs
win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs
win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
win/CS/HandBrake.ApplicationServices/Utilities/LanguageUtilities.cs
win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
win/CS/HandBrake.Server/Program.cs
win/CS/HandBrakeWPF/AttachedProperties/DriveMenu.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Constants.cs
win/CS/HandBrakeWPF/Controls/DropButton/DropButton.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
win/CS/HandBrakeWPF/Helpers/CliCheckHelper.cs
win/CS/HandBrakeWPF/Installer/Installer.nsi
win/CS/HandBrakeWPF/Installer/Installer64.nsi
win/CS/HandBrakeWPF/Model/SourceMenuItem.cs
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/Services/DriveDetectService.cs [deleted file]
win/CS/HandBrakeWPF/Services/Interfaces/IDriveDetectService.cs [deleted file]
win/CS/HandBrakeWPF/Services/Interfaces/INotificationService.cs
win/CS/HandBrakeWPF/Services/Interfaces/IPrePostActionService.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Services/PrePostActionService.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
win/CS/HandBrakeWPF/UserSettingConstants.cs
win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs
win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
win/CS/HandBrakeWPF/Views/AddPresetView.xaml
win/CS/HandBrakeWPF/Views/AudioView.xaml
win/CS/HandBrakeWPF/Views/MainView.xaml
win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
win/CS/HandBrakeWPF/Views/QueueView.xaml
win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
win/CS/HandBrakeWPF/Views/VideoView.xaml
win/CS/HandBrakeWPF/defaultsettings.xml