OSDN Git Service

Merge the 5.1 branch into the trunk.
authorprigaux <prigaux@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 6 Mar 2007 21:15:55 +0000 (21:15 +0000)
committerprigaux <prigaux@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 6 Mar 2007 21:15:55 +0000 (21:15 +0000)
commit52d45181a7d1df6016d32c1842622660224538e0
tree4ff9eee3e39a530cb649d9db43456e0ab3d712a3
parent292fd172065cb7a3572b5338226ad52c3c1c2f0b
Merge the 5.1 branch into the trunk.

git-svn-id: svn://localhost/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5
95 files changed:
AUTHORS
BUILD
BuildContribsDarwin.sh
DownloadMacOsXContribBinaries.sh
Jamfile
MP4toMOV/MP4toMOV.app/Contents/Frameworks/RBQT.rbx_0.128.dylib [new file with mode: 0644]
MP4toMOV/MP4toMOV.app/Contents/Info.plist [new file with mode: 0644]
MP4toMOV/MP4toMOV.app/Contents/MacOS/MP4toMOV [new file with mode: 0755]
MP4toMOV/MP4toMOV.app/Contents/MacOS/rbframework.dylib [new file with mode: 0644]
MP4toMOV/MP4toMOV.app/Contents/PkgInfo [new file with mode: 0644]
MP4toMOV/MP4toMOV.rbp [new file with mode: 0644]
MP4toMOV/README [new file with mode: 0644]
MacOsXContribBinariesVersion.txt
Makefile
Makefile.config [new file with mode: 0644]
contrib/Jamfile
contrib/Makefile [new file with mode: 0644]
contrib/patch-ffmpeg-macintel.patch [deleted file]
contrib/patch-libdvdread.patch [deleted file]
contrib/patch-libquicktime.patch [new file with mode: 0644]
contrib/patch-mpeg4ip.patch [new file with mode: 0644]
contrib/patch-x264-linux.patch [new file with mode: 0644]
contrib/version_a52dec.txt
contrib/version_faac.txt
contrib/version_ffmpeg.txt
contrib/version_lame.txt
contrib/version_libdvdcss.txt
contrib/version_libdvdread.txt
contrib/version_libogg.txt
contrib/version_libsamplerate.txt
contrib/version_libvorbis.txt
contrib/version_mpeg2dec.txt
contrib/version_mpeg4ip.txt
contrib/version_qt.txt [new file with mode: 0644]
contrib/version_x264.txt
contrib/version_xvidcore.txt
contrib/version_zlib.txt [new file with mode: 0644]
libhb/Jamfile [moved from libmediafork/Jamfile with 52% similarity]
libhb/Makefile [moved from libmediafork/Makefile with 76% similarity]
libhb/common.c [moved from libmediafork/common.c with 100% similarity]
libhb/common.h [moved from libmediafork/common.h with 86% similarity]
libhb/deca52.c [moved from libmediafork/deca52.c with 78% similarity]
libhb/decavcodec.c [moved from libmediafork/decavcodec.c with 99% similarity]
libhb/declpcm.c [moved from libmediafork/declpcm.c with 98% similarity]
libhb/decmpeg2.c [moved from libmediafork/decmpeg2.c with 99% similarity]
libhb/decsub.c [moved from libmediafork/decsub.c with 99% similarity]
libhb/demuxmpeg.c [moved from libmediafork/demuxmpeg.c with 99% similarity]
libhb/dvd.c [moved from libmediafork/dvd.c with 97% similarity]
libhb/encavcodec.c [moved from libmediafork/encavcodec.c with 99% similarity]
libhb/encfaac.c [moved from libmediafork/encfaac.c with 82% similarity]
libhb/enclame.c [moved from libmediafork/enclame.c with 99% similarity]
libhb/encvorbis.c [moved from libmediafork/encvorbis.c with 99% similarity]
libhb/encx264.c [moved from libmediafork/encx264.c with 78% similarity]
libhb/encxvid.c [moved from libmediafork/encxvid.c with 99% similarity]
libhb/fifo.c [moved from libmediafork/fifo.c with 99% similarity]
libhb/hb.c [moved from libmediafork/mediafork.c with 99% similarity]
libhb/hb.h [moved from libmediafork/mediafork.h with 100% similarity]
libhb/internal.h [moved from libmediafork/internal.h with 100% similarity]
libhb/ipodutil.cpp [moved from libmediafork/ipodutil.cpp with 100% similarity]
libhb/lang.h [moved from libmediafork/lang.h with 100% similarity]
libhb/muxavi.c [moved from libmediafork/muxavi.c with 99% similarity]
libhb/muxcommon.c [moved from libmediafork/muxcommon.c with 99% similarity]
libhb/muxmp4.c [moved from libmediafork/muxmp4.c with 67% similarity]
libhb/muxogm.c [moved from libmediafork/muxogm.c with 99% similarity]
libhb/ports.c [moved from libmediafork/ports.c with 99% similarity]
libhb/ports.h [moved from libmediafork/ports.h with 98% similarity]
libhb/reader.c [moved from libmediafork/reader.c with 99% similarity]
libhb/render.c [moved from libmediafork/render.c with 99% similarity]
libhb/scan.c [moved from libmediafork/scan.c with 97% similarity]
libhb/sync.c [moved from libmediafork/sync.c with 93% similarity]
libhb/update.c [moved from libmediafork/update.c with 99% similarity]
libhb/work.c [moved from libmediafork/work.c with 82% similarity]
macosx/Controller.h
macosx/Controller.mm
macosx/DriveDetector.m
macosx/English.lproj/MainMenu.nib/classes.nib
macosx/English.lproj/MainMenu.nib/info.nib
macosx/English.lproj/MainMenu.nib/keyedobjects.nib
macosx/ExpressController.h
macosx/HandBrake.icns [new file with mode: 0644]
macosx/HandBrake.plist [new file with mode: 0644]
macosx/HandBrake.xcodeproj/pri.mode1 [new file with mode: 0644]
macosx/HandBrake.xcodeproj/pri.pbxuser [new file with mode: 0644]
macosx/HandBrake.xcodeproj/project.pbxproj [moved from macosx/MediaFork.xcodeproj/project.pbxproj with 71% similarity]
macosx/MediaFork.plist [deleted file]
macosx/PictureController.h
macosx/PictureGLView.h
macosx/PrefsController.h
macosx/PrefsController.m
macosx/QueueController.h
macosx/ScanController.h
macosx/localize.sh
test/BUILDSHARED
test/Makefile
test/test.c