]> granicus.if.org Git - handbrake/commit
Merging trunk into opencl branch. This includes an update to libav-9.1
authorsr55 <sr55.hb@outlook.com>
Wed, 16 Jan 2013 19:29:50 +0000 (19:29 +0000)
committersr55 <sr55.hb@outlook.com>
Wed, 16 Jan 2013 19:29:50 +0000 (19:29 +0000)
commit9518d3be2e8e1368131b90dce3bfd452199c35a9
treea0f494ab220a694ad2b47a96a3538eceeafde3c6
parent201ded15dac6aed5ed1089f6d7e78497fd791c03
Merging trunk into opencl branch. This includes an update to libav-9.1

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5177 b64f7644-9d1e-0410-96f1-a4d463321fa5
57 files changed:
contrib/ffmpeg/A01-swscale-assert.patch
contrib/ffmpeg/A03-h264-recovery-point.patch
contrib/ffmpeg/A04-dca-resync.patch [moved from contrib/ffmpeg/A05-dca-resync.patch with 100% similarity]
contrib/ffmpeg/A04-snow-use-videodspcontext.patch [deleted file]
contrib/ffmpeg/P01-solaris.patch
contrib/ffmpeg/P02-darwin-pic.patch
contrib/ffmpeg/module.defs
contrib/libiconv/A00-do-not-build-preloadable-iconv-shared-library.patch [new file with mode: 0644]
gtk/configure.ac
gtk/src/audiohandler.c
gtk/src/callbacks.c
gtk/src/callbacks.h
gtk/src/ghb.ui
gtk/src/ghbcellrenderertext.c
gtk/src/ghbcompositor.c
gtk/src/hb-backend.c
gtk/src/internal_defaults.xml
gtk/src/main.c
gtk/src/preview.c
gtk/src/renderer_button.c
gtk/src/settings.c
gtk/src/standard_presets.xml
macosx/Controller.h
macosx/Controller.m
test/test.c
win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
win/CS/HandBrake.ApplicationServices/Services/Encode.cs
win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Controls/NumberBox.xaml [new file with mode: 0644]
win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Controls/RefireControl.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs
win/CS/HandBrakeWPF/Converters/Options/OptionsTabNameConverter.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/HandBrakeWPF.csproj
win/CS/HandBrakeWPF/Model/OptionsTab.cs [new file with mode: 0644]
win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
win/CS/HandBrakeWPF/Properties/Resources.resx
win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
win/CS/HandBrakeWPF/ViewModels/Interfaces/IOptionsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
win/CS/HandBrakeWPF/Views/AboutView.xaml
win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
win/CS/HandBrakeWPF/Views/AddPresetView.xaml
win/CS/HandBrakeWPF/Views/AdvancedView.xaml
win/CS/HandBrakeWPF/Views/AudioView.xaml
win/CS/HandBrakeWPF/Views/FiltersView.xaml
win/CS/HandBrakeWPF/Views/OptionsView.xaml
win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
win/CS/HandBrakeWPF/Views/ShellView.xaml
win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
win/CS/HandBrakeWPF/Views/VideoView.xaml