]> granicus.if.org Git - handbrake/commit
Merging trunk to opencl branch.
authorsr55 <sr55.hb@outlook.com>
Sat, 29 Dec 2012 19:11:29 +0000 (19:11 +0000)
committersr55 <sr55.hb@outlook.com>
Sat, 29 Dec 2012 19:11:29 +0000 (19:11 +0000)
commit403d4abe29055f9d910d10ed28509a684805f835
treed5e11acdce5a72932f7e808410a0f5fa73b5fcec
parentab39134445f79f1684a3d8ab814085e04ade27d7
Merging trunk to opencl branch.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5116 b64f7644-9d1e-0410-96f1-a4d463321fa5
89 files changed:
gtk/src/Makefile.am
gtk/src/appcast.c
gtk/src/appcast.h
gtk/src/audiohandler.c
gtk/src/audiohandler.h
gtk/src/callbacks.c
gtk/src/callbacks.h
gtk/src/create_resources.c
gtk/src/create_resources.py
gtk/src/ghb-dvd.c
gtk/src/ghb.ui
gtk/src/ghbcellrenderertext.c
gtk/src/ghbcellrenderertext.h
gtk/src/ghbcompat.h
gtk/src/ghbcompositor.c
gtk/src/hb-backend.c
gtk/src/hb-backend.h
gtk/src/icon_tools.c
gtk/src/icons.c
gtk/src/ini_to_plist.c
gtk/src/internal_defaults.xml
gtk/src/main.c
gtk/src/makedeps.py
gtk/src/marshalers.c
gtk/src/marshalers.h
gtk/src/plist.c
gtk/src/preset_xlat.c
gtk/src/presets.c
gtk/src/presets.h
gtk/src/preview.c
gtk/src/queuehandler.c
gtk/src/queuehandler.h
gtk/src/quotestring.c
gtk/src/quotestring.py
gtk/src/renderer_button.c
gtk/src/renderer_button.h
gtk/src/resources.c
gtk/src/resources.list
gtk/src/settings.c
gtk/src/settings.h
gtk/src/standard_presets.xml
gtk/src/subtitlehandler.c
gtk/src/subtitlehandler.h
gtk/src/values.c
gtk/src/values.h
gtk/src/widgetdeps.c
gtk/src/x264handler.c
gtk/src/x264handler.h
libhb/common.c
libhb/common.h
libhb/encx264.c
libhb/encx264.h
libhb/hb.c
libhb/hb.h
libhb/hb_dict.h
libhb/muxmp4.c
scripts/manicure.rb
test/test.c
win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
win/CS/HandBrake.ApplicationServices/Services/Encode.cs
win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
win/CS/HandBrake.ApplicationServices/Utilities/EnumHelper.cs
win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Preset.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Profile.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/x264/x264Tune.cs
win/CS/HandBrakeWPF/Commands/AdvancedEncoderOptionsCommand.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Commands/Interfaces/IAdvancedEncoderOptionsCommand.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
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/Interfaces/IAdvancedViewModel.cs
win/CS/HandBrakeWPF/ViewModels/Interfaces/IVideoViewModel.cs
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
win/CS/HandBrakeWPF/Views/AdvancedView.xaml
win/CS/HandBrakeWPF/Views/MainView.xaml
win/CS/HandBrakeWPF/Views/OptionsView.xaml
win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
win/CS/HandBrakeWPF/Views/VideoView.xaml
win/CS/HandBrakeWPF/defaultsettings.xml