]> granicus.if.org Git - handbrake/commit
Merging Trunk into OpenCL Branch.
authorsr55 <sr55.hb@outlook.com>
Sun, 24 Feb 2013 14:09:48 +0000 (14:09 +0000)
committersr55 <sr55.hb@outlook.com>
Sun, 24 Feb 2013 14:09:48 +0000 (14:09 +0000)
commit4a69d1eaa961de1c6bb624cc7e40ed60fc8a42a5
tree2dd03f5f0a254fe4f51b887b61a38c5764b908b4
parentffdcce587a46c77eaa651535f3303ea9109d0497
Merging Trunk into OpenCL Branch.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5264 b64f7644-9d1e-0410-96f1-a4d463321fa5
74 files changed:
contrib/bzip2/module.defs
contrib/ffmpeg/A05-truehd-downmix.patch [new file with mode: 0644]
contrib/ffmpeg/module.defs
contrib/libdvdnav/module.defs
contrib/libsamplerate/module.defs
contrib/mp4v2/module.defs
gtk/src/ghb.ui
libhb/common.c
libhb/common.h
libhb/decavcodec.c
libhb/encavcodecaudio.c
libhb/hb.c
libhb/internal.h
libhb/ports.c
libhb/ports.h
libhb/work.c
macosx/Controller.m
macosx/English.lproj/Preferences.xib
macosx/HBAudioController.m
macosx/HBPreviewController.m
macosx/PictureController.h
macosx/PictureController.m
make/variant/mingw.defs
test/test.c
win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs
win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeCompletedEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/EncodeCompletedEventArgs.cs with 91% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/EncodeProgressEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/EncodeProgressEventArgs.cs with 91% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/MessageLoggedEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/MessageLoggedEventArgs.cs with 88% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/EventArgs/ScanProgressEventArgs.cs [moved from win/CS/HandBrake.Interop/HandBrakeInterop/ScanProgressEventArgs.cs with 91% similarity]
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj
win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Interfaces/IHandBrakeInstance.cs
win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs
win/CS/HandBrake.Interop/HandBrakeInterop/LanguageCodes.cs
win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/BitrateLimits.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/EncodeJob.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/RangeLimits.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Size.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceSubtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SourceType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/SrtSubtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Subtitles.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/VideoRangeType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioCodec.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/AudioTrack.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Chapter.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/InputType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Subtitle.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleSource.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/SubtitleType.cs
win/CS/HandBrake.Interop/HandBrakeInterop/SourceData/Title.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs
win/CS/HandBrake.Interop/HandBrakeInterop/libgcc_s_sjlj-1.dll [deleted file]
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/ViewModels/Interfaces/IEncoderOptionsViewModel.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/ViewModels/Interfaces/IX264ViewModel.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Views/AdvancedView.xaml
win/CS/HandBrakeWPF/Views/EncoderOptionsView.xaml [new file with mode: 0644]
win/CS/HandBrakeWPF/Views/EncoderOptionsView.xaml.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Views/OptionsView.xaml
win/CS/HandBrakeWPF/Views/X264View.xaml [new file with mode: 0644]
win/CS/HandBrakeWPF/Views/X264View.xaml.cs [new file with mode: 0644]