Set svn:eol-style=native on most text files.

Goodbye evil CRLF.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1518 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 535 insertions, 535 deletions

diff --git a/BUILD b/BUILD
index e52213d0a..c7401ffd2 100644
--- a/BUILD
+++ b/BUILD
@@ -1,103 +1,103 @@
-$Id: BUILD,v 1.11 2005/10/23 01:35:59 titer Exp $

-

-BUILD file for HandBrake <http://handbrake.fr/>

-

-Building HandBrake with make

-=============================

-

-Step 1: get needed tools

-==============

-

-+ gcc and g++

-    There are usually included in your OS' dev tools. On BeOS/Zeta, the

-    default gcc isn't enough, gcc 2.95.3 is required.

-

-+ nasm (Only for x86. On Mac OS X Intel, Xcode 2.4.1 include it)

-

-Cygwin setup:

-    There are a couple extra things required to make the code build for Cygwin.

-    Make sure you have /bin and /usr/bin on your path *first*, before

-    the Windows paths.  Otherwise the Cygwin find.exe won't be used, and

-    lame won't build.

-    Also, I have not tried to build this with MinGW, I've only built it with

-    the Cygwin environment, so you should build with Cygwin gcc and dev tools.

-    Unfortunately this means you need to have cygwin1.dll around to run the

-    HandbrakeCLI.exe program, but that's the way it is for now, until I get time

-    to try building it with MinGW.  If you want to try making it work with

-    MinGW, then go for it!

-

-Step 2: configuration

-==============

-

-The HB_BUILD and HB_VERSION are defined in a single file, the Makefile correct the values in Xcode too.

-

-The file where the informations are stored is Makefile.config

-

-Step 3: build

-==============

-

-Run `make'. This will build libhb, Handbrake and HandBrakeCLI as Universal Binary.

-This build method use precompiled contrib libraries. Script to build those binaries are provided too.

-All the build is handled by Xcode 2.4.1, should work on powerPC and Intel Macs.

-

-# To build under Cygwin simply use the command:

-make HandbrakeCLI

-

-This will download pre-compiled libaries and build the handbrake source.

-

------------------------------------------------------------------------------------------------------

-

-Building HandBrake with jam

-=============================

-

-You can build HandBrake on BeOS, MacOS X, Linux, and on Windows using Cygwin.

-If you'd like to port it to another OS, email me ([email protected]).

-

-Step 1: get needed tools

-==============

-

-+ gcc and g++

-    There are usually included in your OS' dev tools. On BeOS/Zeta, the

-    default gcc isn't enough, gcc 2.95.3 is required.

-

-+ jam

-    I use 2.5rc3, earlier versions might cause issues.

-    On BeOS, you can download it at <http://www.haiku-os.org/develop.php>.

-    On OS X, you cannot use the modified jam shipped with the developer

-    tools, use the one included in the Handbrake svn checkout instead.

-    On Cygwin, get the jam source from

-    http://public.perforce.com/public/jam/index.html,

-    compile it with gcc in Cygwin, and put the jam executable somewhere on

-    your path.

-

-+ nasm (Only for x86. On Mac OS X Intel, Xcode 2.4.1 include it)

-

-+ libtool, autoconf, automake

-    To build libdca (the DTS audio extraction library) on Mac OS X via jam, you'll

-    need to update the default Mac OS X versions of libtool, autoconf and automake.

-    Compilation has been seen to work with libtool and libtool-shlibs v1.5.22-1000,

-    autoconf v2.60-4, and automake v1.9.6-3.  You can update these tools using Fink.

-    Download the Fink 0.8.1 Binary Installer for your platform (PowerPC or Intel)

-    from http://www.finkproject.org/download/index.php?phpLang=en and install Fink

-    using the installer.  If you want to use a GUI to run Fink, you can install

-    FinkCommander.  Download the FinkCommander 0.5.4 installer from

-    http://finkcommander.sourceforge.net/ and install from the disk image.  You can

-    install libtool, libtool-shlibs, autoconf and automake using FinkCommander.

-

-Cygwin setup:

-    There are a couple extra things required to make the code build for Cygwin.

-    Make sure you have /bin and /usr/bin on your path *first*, before

-    the Windows paths.  Otherwise the Cygwin find.exe won't be used, and

-    lame won't build.

-    Also, I have not tried to build this with MinGW, I've only built it with

-    the Cygwin environment, so you should build with Cygwin gcc and dev tools.

-    Unfortunately this means you need to have cygwin1.dll around to run the

-    HandbrakeCLI.exe program, but that's the way it is for now, until I get time

-    to try building it with MinGW.  If you want to try making it work with

-    MinGW, then go for it!

-

-Step 2: build

-==============

-

-Run `./configure && jam'. This will build every library HandBrake

-requires, then HandBrake itself.

+$Id: BUILD,v 1.11 2005/10/23 01:35:59 titer Exp $
+
+BUILD file for HandBrake <http://handbrake.fr/>
+
+Building HandBrake with make
+=============================
+
+Step 1: get needed tools
+==============
+
++ gcc and g++
+    There are usually included in your OS' dev tools. On BeOS/Zeta, the
+    default gcc isn't enough, gcc 2.95.3 is required.
+
++ nasm (Only for x86. On Mac OS X Intel, Xcode 2.4.1 include it)
+
+Cygwin setup:
+    There are a couple extra things required to make the code build for Cygwin.
+    Make sure you have /bin and /usr/bin on your path *first*, before
+    the Windows paths.  Otherwise the Cygwin find.exe won't be used, and
+    lame won't build.
+    Also, I have not tried to build this with MinGW, I've only built it with
+    the Cygwin environment, so you should build with Cygwin gcc and dev tools.
+    Unfortunately this means you need to have cygwin1.dll around to run the
+    HandbrakeCLI.exe program, but that's the way it is for now, until I get time
+    to try building it with MinGW.  If you want to try making it work with
+    MinGW, then go for it!
+
+Step 2: configuration
+==============
+
+The HB_BUILD and HB_VERSION are defined in a single file, the Makefile correct the values in Xcode too.
+
+The file where the informations are stored is Makefile.config
+
+Step 3: build
+==============
+
+Run `make'. This will build libhb, Handbrake and HandBrakeCLI as Universal Binary.
+This build method use precompiled contrib libraries. Script to build those binaries are provided too.
+All the build is handled by Xcode 2.4.1, should work on powerPC and Intel Macs.
+
+# To build under Cygwin simply use the command:
+make HandbrakeCLI
+
+This will download pre-compiled libaries and build the handbrake source.
+
+-----------------------------------------------------------------------------------------------------
+
+Building HandBrake with jam
+=============================
+
+You can build HandBrake on BeOS, MacOS X, Linux, and on Windows using Cygwin.
+If you'd like to port it to another OS, email me ([email protected]).
+
+Step 1: get needed tools
+==============
+
++ gcc and g++
+    There are usually included in your OS' dev tools. On BeOS/Zeta, the
+    default gcc isn't enough, gcc 2.95.3 is required.
+
++ jam
+    I use 2.5rc3, earlier versions might cause issues.
+    On BeOS, you can download it at <http://www.haiku-os.org/develop.php>.
+    On OS X, you cannot use the modified jam shipped with the developer
+    tools, use the one included in the Handbrake svn checkout instead.
+    On Cygwin, get the jam source from
+    http://public.perforce.com/public/jam/index.html,
+    compile it with gcc in Cygwin, and put the jam executable somewhere on
+    your path.
+
++ nasm (Only for x86. On Mac OS X Intel, Xcode 2.4.1 include it)
+
++ libtool, autoconf, automake
+    To build libdca (the DTS audio extraction library) on Mac OS X via jam, you'll
+    need to update the default Mac OS X versions of libtool, autoconf and automake.
+    Compilation has been seen to work with libtool and libtool-shlibs v1.5.22-1000,
+    autoconf v2.60-4, and automake v1.9.6-3.  You can update these tools using Fink.
+    Download the Fink 0.8.1 Binary Installer for your platform (PowerPC or Intel)
+    from http://www.finkproject.org/download/index.php?phpLang=en and install Fink
+    using the installer.  If you want to use a GUI to run Fink, you can install
+    FinkCommander.  Download the FinkCommander 0.5.4 installer from
+    http://finkcommander.sourceforge.net/ and install from the disk image.  You can
+    install libtool, libtool-shlibs, autoconf and automake using FinkCommander.
+
+Cygwin setup:
+    There are a couple extra things required to make the code build for Cygwin.
+    Make sure you have /bin and /usr/bin on your path *first*, before
+    the Windows paths.  Otherwise the Cygwin find.exe won't be used, and
+    lame won't build.
+    Also, I have not tried to build this with MinGW, I've only built it with
+    the Cygwin environment, so you should build with Cygwin gcc and dev tools.
+    Unfortunately this means you need to have cygwin1.dll around to run the
+    HandbrakeCLI.exe program, but that's the way it is for now, until I get time
+    to try building it with MinGW.  If you want to try making it work with
+    MinGW, then go for it!
+
+Step 2: build
+==============
+
+Run `./configure && jam'. This will build every library HandBrake
+requires, then HandBrake itself.
diff --git a/CREDITS b/CREDITS
index 4b815b9ee..52fbad57c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,160 +1,160 @@
-CREDITS file for HandBrake <http://handbrake.fr/>

-

-HandBrake uses many cool libraries from the GNU/Linux world.

-Thank their authors!

-

-liba52 authors:

-  Aaron Holtzman

-  Michel Lespinasse

-  Gildas Bazin

-  Billy Biggs

-  Eduard Hasenleithner

-  H�kan Hjort

-  Charles M. Hannum

-  Chris Hodges

-  Michael Holzt

-  Angelos Keromytis

-  David I. Lehn

-  Don Mahurin

-  Jim Miller

-  Takefumi Sayo

-  Shoji Tokunaga

-

-libavcodec authors:

-  Fabrice Bellard

-  Alex Beregszaszi

-  Brian Foley

-  Arpad Gereoffy

-  Philip Gladstone

-  Falk Hueffner

-  Zdenek Kabelac

-  Nick Kurshev

-  Michael Niedermayer

-  Fran�ois Revol

-  Dieter Shirley

-  Juan J. Sierralta

-  Lionel Ulmer

-

-libdts authors:

-  Gildas Bazin

-  Sam Hocevar

-

-libdvdcss authors:

-  Billy Biggs

-  St�phane Borel

-  H�kan Hjort

-  Samuel Hocevar

-  Eugenio Jarosiewicz

-  Jon Lech Johansen

-  Markus Kuespert

-  Pascal Levesque

-  Steven M. Schultz

-  David Sieb�rger

-  Alex Strelnikov

-  German Tischler

-  Gildas Bazin

-

-libdvdread authors:

-  Bj�rn Englund

-  H�kan Hjort

-  Billy Biggs

-  Christian Wolff

-

-libfaac authors:

-  M. Bakker

-  Tony Lenox

-  RageOMatic

-  thebard

-  Ivan Dimkovic

-  Krzysztof Nikiel

-

-libmp3lame authors:

-  Mike Cheng

-  Robert Hegemann

-  Frank Klemm

-  Alexander Leidinger

-  Naoki Shibata

-  Mark Taylor

-  Takehiro Tominiga

-  Iv�n Cavero Belaunde

-  Gabriel Bouvigne

-  Florian Bomers

-  CISC

-  John Dahlstrom

-  John Dee

-  Albert Faber

-  Peter Gubanov

-  Lars Magne Ingebrigtsen 	

-  Yosi Markovich

-  Zdenek Kabelac

-  Iwasa Kazmi

-  Guillaume Lessard

-  Steve Lhomme

-  Don Melton

-  Viral Shah

-  Acy Stapp

-  Roel VdB

-

-libmp4v2 authors:

-  Dave Mackie

-  Alix Marchandise-Franquet

-  Bill May

-  Massimo Villari

-  Waqar Mohsin

-  Richard Chen

-  Rob Arnold

-  Howdy Pierce

-  Steven Schultz

-  [email protected]

-  Sean Gilligan

-  Michael Rossberg

-  Luis F. Ramirez

-  Petter Reinholdtsen

-

-libmpeg2 authors:

-  Aaron Holtzman

-  Michel Lespinasse

-  Bruno Barreyra

-  Gildas Bazin

-  Alexander W. Chin

-  Stephen Crowley

-  Didier Gautheron

-  Ryan C. Gordon

-  Peter Gubanov

-  H�kan Hjort

-  Nicolas Joly

-  Gerd Knorr

-  David I. Lehn

-  Olie Lho

-  Rick Niles

-  Real Ouellet

-  Bajusz Peter

-  Franck Sicard

-  Brion Vibber

-  Martin Vogt

-  Fredrik Vraalsen

-

-libogg authors:

-  Christopher Montgomery

-

-libsamplerate authors:

-  Erik de Castro Lopo

-

-libvorbis authors:

-  Christopher Montgomery

-

-libx264 authors:

-  Laurent Aimar

-

-libxvidcore authors:

-  Christoph Lampert

-  Michael Militzer

-  Peter Ross

-  Benjamin Herrenschmidt

-  Daniel Smith

-  Dirk Knop

-  Edouard Gomez

-  Guillaume Morin

-  MinChen

-  Pascal Massimino

-  Radoslaw Czyz

+CREDITS file for HandBrake <http://handbrake.fr/>
+
+HandBrake uses many cool libraries from the GNU/Linux world.
+Thank their authors!
+
+liba52 authors:
+  Aaron Holtzman
+  Michel Lespinasse
+  Gildas Bazin
+  Billy Biggs
+  Eduard Hasenleithner
+  H�kan Hjort
+  Charles M. Hannum
+  Chris Hodges
+  Michael Holzt
+  Angelos Keromytis
+  David I. Lehn
+  Don Mahurin
+  Jim Miller
+  Takefumi Sayo
+  Shoji Tokunaga
+
+libavcodec authors:
+  Fabrice Bellard
+  Alex Beregszaszi
+  Brian Foley
+  Arpad Gereoffy
+  Philip Gladstone
+  Falk Hueffner
+  Zdenek Kabelac
+  Nick Kurshev
+  Michael Niedermayer
+  Fran�ois Revol
+  Dieter Shirley
+  Juan J. Sierralta
+  Lionel Ulmer
+
+libdts authors:
+  Gildas Bazin
+  Sam Hocevar
+
+libdvdcss authors:
+  Billy Biggs
+  St�phane Borel
+  H�kan Hjort
+  Samuel Hocevar
+  Eugenio Jarosiewicz
+  Jon Lech Johansen
+  Markus Kuespert
+  Pascal Levesque
+  Steven M. Schultz
+  David Sieb�rger
+  Alex Strelnikov
+  German Tischler
+  Gildas Bazin
+
+libdvdread authors:
+  Bj�rn Englund
+  H�kan Hjort
+  Billy Biggs
+  Christian Wolff
+
+libfaac authors:
+  M. Bakker
+  Tony Lenox
+  RageOMatic
+  thebard
+  Ivan Dimkovic
+  Krzysztof Nikiel
+
+libmp3lame authors:
+  Mike Cheng
+  Robert Hegemann
+  Frank Klemm
+  Alexander Leidinger
+  Naoki Shibata
+  Mark Taylor
+  Takehiro Tominiga
+  Iv�n Cavero Belaunde
+  Gabriel Bouvigne
+  Florian Bomers
+  CISC
+  John Dahlstrom
+  John Dee
+  Albert Faber
+  Peter Gubanov
+  Lars Magne Ingebrigtsen 	
+  Yosi Markovich
+  Zdenek Kabelac
+  Iwasa Kazmi
+  Guillaume Lessard
+  Steve Lhomme
+  Don Melton
+  Viral Shah
+  Acy Stapp
+  Roel VdB
+
+libmp4v2 authors:
+  Dave Mackie
+  Alix Marchandise-Franquet
+  Bill May
+  Massimo Villari
+  Waqar Mohsin
+  Richard Chen
+  Rob Arnold
+  Howdy Pierce
+  Steven Schultz
+  [email protected]
+  Sean Gilligan
+  Michael Rossberg
+  Luis F. Ramirez
+  Petter Reinholdtsen
+
+libmpeg2 authors:
+  Aaron Holtzman
+  Michel Lespinasse
+  Bruno Barreyra
+  Gildas Bazin
+  Alexander W. Chin
+  Stephen Crowley
+  Didier Gautheron
+  Ryan C. Gordon
+  Peter Gubanov
+  H�kan Hjort
+  Nicolas Joly
+  Gerd Knorr
+  David I. Lehn
+  Olie Lho
+  Rick Niles
+  Real Ouellet
+  Bajusz Peter
+  Franck Sicard
+  Brion Vibber
+  Martin Vogt
+  Fredrik Vraalsen
+
+libogg authors:
+  Christopher Montgomery
+
+libsamplerate authors:
+  Erik de Castro Lopo
+
+libvorbis authors:
+  Christopher Montgomery
+
+libx264 authors:
+  Laurent Aimar
+
+libxvidcore authors:
+  Christoph Lampert
+  Michael Militzer
+  Peter Ross
+  Benjamin Herrenschmidt
+  Daniel Smith
+  Dirk Knop
+  Edouard Gomez
+  Guillaume Morin
+  MinChen
+  Pascal Massimino
+  Radoslaw Czyz
diff --git a/Makefile b/Makefile
index de448284e..b2849f24c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,138 +1,138 @@
-include Makefile.config

-

-SYSTEM = $(shell uname -s)

-

-# Special case for Mac OS X: everything is handled from the Xcode project

-

-#

-# Darwin

-#

-ifeq ($(SYSTEM),Darwin)

-

-snapshot:   clean snapshot-app

-

-all:    clean app

-

-all-chunky:    clean app-chunky

-

-test:	clean cli

-

-dev:	clean internal

-

-app:    libhb/hbversion.h

-	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )

-

-contrib/.contrib:

-	@$(MAKE) --no-print-directory -C contrib all

-

-snapshot-app: contrib/.contrib unstable-libhb/hbversion.h

-	( cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment HB_BUILD="$(SNAP_HB_BUILD)" HB_VERSION="$(SNAP_HB_VERSION)" CURRENT_PROJECT_VERSION="$(SNAP_HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast_unstable.xml" build | sed '/^$$/d' )

-

-app-chunky: libhb/hbversion.h

-	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )

-

-cli:    libhb/hbversion.h

-	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" build | sed '/^$$/d' )

-

-clean:

-	(cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ; rm -f libhb/hbversion.h )

-

-mrproper:

-	(rm -rf libhb/hbversion.h contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )

-

-release:

-	(rm -rf HandBrake HandBrake*dmg ; mkdir -p HandBrake/api HandBrake/doc HandBrake/doc/pdf; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ; cp -rp pdf/ HandBrake/doc/pdf/ ; cp -rp HandBrake.app HandBrake ; cp -rp libhb/libhb.dylib HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOS_UB.dmg ; rm -rf HandBrake )

-

-gui-release:

-	(rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(HB_VERSION)-MacOSX.4_GUI_UB.dmg ; rm -rf HandBrake )

-

-cli-release:

-	(rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOSX.3_CLI_UB.dmg ; rm -rf HandBrake )

-

-gui-snapshot-release:

-	(rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(SNAP_HB_VERSION)-MacOSX.5_GUI_UB.dmg ; rm -rf HandBrake )

-

-cli-snapshot-release:

-	(rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(SNAP_HB_VERSION)-MacOSX.5_CLI_UB.dmg ; rm -rf HandBrake )

-

-endif

-

-#

-# Linux

-#

-ifeq ($(SYSTEM),Linux)

-

-all:	contrib/.contrib libhb/libhb.a HandBrakeCLI

-	(rm -rf HandBrake HandBrake*.tar.gz ; mkdir -p HandBrake/api HandBrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ;  cp -rp libhb/libhb.so HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; tar zcvf HandBrake-$(HB_VERSION)_i386.tar.gz HandBrake ; rm -rf HandBrake )

-

-contrib/.contrib:

-	@$(MAKE) --no-print-directory -C contrib all

-

-libhb/libhb.a: unstable-libhb/hbversion.h

-	@$(MAKE) --no-print-directory -C libhb all

-

-HandBrakeCLI:

-	@$(MAKE) --no-print-directory -C test all

-

-clean:

-	@$(MAKE) --no-print-directory -C libhb clean

-	@$(MAKE) --no-print-directory -C test clean

-	@rm libhb/hbversion.h

-

-mrproper: clean

-	@$(MAKE) --no-print-directory -C contrib mrproper

-

-endif

-

-#

-# Cygwin

-#

-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)

-

-all:    contrib/.contrib libhb/libhb.a HandBrakeCLI

-

-app:	contribPack libhb/libhb.a HandBrakeCLI

-

-contribPack:

-	(./DownloadCygWinContribBinaries.sh)

-	

-contrib/.contrib:

-	@$(MAKE) --no-print-directory -C contrib all

-

-libhb/libhb.a: unstable-libhb/hbversion.h

-	@$(MAKE) --no-print-directory -C libhb all

-

-HandBrakeCLI: 

-	@$(MAKE) --no-print-directory -C test all

-	

-clean:

-	@$(MAKE) --no-print-directory -C libhb clean

-	@$(MAKE) --no-print-directory -C test clean

-	@rm libhb/hbversion.h

-

-mrproper: clean

-	@$(MAKE) --no-print-directory -C contrib mrproper

-

-endif

-

-libhb/hbversion.h:

-	echo "#ifndef HB_BUILD" > libhb/hbversion.h

-	echo "#define HB_BUILD $(HB_BUILD)" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_VERSION" >> libhb/hbversion.h

-	echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h

-	echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-

-unstable-libhb/hbversion.h:

-	echo "#ifndef HB_BUILD" > libhb/hbversion.h

-	echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_VERSION" >> libhb/hbversion.h

-	echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h

-	echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

+include Makefile.config
+
+SYSTEM = $(shell uname -s)
+
+# Special case for Mac OS X: everything is handled from the Xcode project
+
+#
+# Darwin
+#
+ifeq ($(SYSTEM),Darwin)
+
+snapshot:   clean snapshot-app
+
+all:    clean app
+
+all-chunky:    clean app-chunky
+
+test:	clean cli
+
+dev:	clean internal
+
+app:    libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )
+
+contrib/.contrib:
+	@$(MAKE) --no-print-directory -C contrib all
+
+snapshot-app: contrib/.contrib unstable-libhb/hbversion.h
+	( cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment HB_BUILD="$(SNAP_HB_BUILD)" HB_VERSION="$(SNAP_HB_VERSION)" CURRENT_PROJECT_VERSION="$(SNAP_HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast_unstable.xml" build | sed '/^$$/d' )
+
+app-chunky: libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )
+
+cli:    libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" build | sed '/^$$/d' )
+
+clean:
+	(cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ; rm -f libhb/hbversion.h )
+
+mrproper:
+	(rm -rf libhb/hbversion.h contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
+
+release:
+	(rm -rf HandBrake HandBrake*dmg ; mkdir -p HandBrake/api HandBrake/doc HandBrake/doc/pdf; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ; cp -rp pdf/ HandBrake/doc/pdf/ ; cp -rp HandBrake.app HandBrake ; cp -rp libhb/libhb.dylib HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOS_UB.dmg ; rm -rf HandBrake )
+
+gui-release:
+	(rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(HB_VERSION)-MacOSX.4_GUI_UB.dmg ; rm -rf HandBrake )
+
+cli-release:
+	(rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOSX.3_CLI_UB.dmg ; rm -rf HandBrake )
+
+gui-snapshot-release:
+	(rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(SNAP_HB_VERSION)-MacOSX.5_GUI_UB.dmg ; rm -rf HandBrake )
+
+cli-snapshot-release:
+	(rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(SNAP_HB_VERSION)-MacOSX.5_CLI_UB.dmg ; rm -rf HandBrake )
+
+endif
+
+#
+# Linux
+#
+ifeq ($(SYSTEM),Linux)
+
+all:	contrib/.contrib libhb/libhb.a HandBrakeCLI
+	(rm -rf HandBrake HandBrake*.tar.gz ; mkdir -p HandBrake/api HandBrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ;  cp -rp libhb/libhb.so HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; tar zcvf HandBrake-$(HB_VERSION)_i386.tar.gz HandBrake ; rm -rf HandBrake )
+
+contrib/.contrib:
+	@$(MAKE) --no-print-directory -C contrib all
+
+libhb/libhb.a: unstable-libhb/hbversion.h
+	@$(MAKE) --no-print-directory -C libhb all
+
+HandBrakeCLI:
+	@$(MAKE) --no-print-directory -C test all
+
+clean:
+	@$(MAKE) --no-print-directory -C libhb clean
+	@$(MAKE) --no-print-directory -C test clean
+	@rm libhb/hbversion.h
+
+mrproper: clean
+	@$(MAKE) --no-print-directory -C contrib mrproper
+
+endif
+
+#
+# Cygwin
+#
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+
+all:    contrib/.contrib libhb/libhb.a HandBrakeCLI
+
+app:	contribPack libhb/libhb.a HandBrakeCLI
+
+contribPack:
+	(./DownloadCygWinContribBinaries.sh)
+	
+contrib/.contrib:
+	@$(MAKE) --no-print-directory -C contrib all
+
+libhb/libhb.a: unstable-libhb/hbversion.h
+	@$(MAKE) --no-print-directory -C libhb all
+
+HandBrakeCLI: 
+	@$(MAKE) --no-print-directory -C test all
+	
+clean:
+	@$(MAKE) --no-print-directory -C libhb clean
+	@$(MAKE) --no-print-directory -C test clean
+	@rm libhb/hbversion.h
+
+mrproper: clean
+	@$(MAKE) --no-print-directory -C contrib mrproper
+
+endif
+
+libhb/hbversion.h:
+	echo "#ifndef HB_BUILD" > libhb/hbversion.h
+	echo "#define HB_BUILD $(HB_BUILD)" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+	echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+	echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+
+unstable-libhb/hbversion.h:
+	echo "#ifndef HB_BUILD" > libhb/hbversion.h
+	echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+	echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+	echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
diff --git a/THANKS b/THANKS
index 72cf03010..a717ec8f3 100644
--- a/THANKS
+++ b/THANKS
@@ -1,56 +1,56 @@
-THANKS file for HandBrake <http://handbrake.fr/>

-

-Several people noticeably contributed to MediaFork and HandBrake development

-without writing code (submitting/checking translations, DVD samples, etc).

-Let's thank them here!

-

-Chris (audley)

- + Inspiration and example of patching mpeg4ip for iPod atom support

-

-Omar Ahmad Bhatti

- + Intensive beta testing, suggestions. Convinced me to port HandBrake

-   to OS X, which finally was a pretty good idea.

-

-Hanna Bauer

-Adrien Marquette

-Norbert Rittel

- + German translation

-

-Paul B�n�chet

-Luidgi Esposito

-Andrea Gianarro

-Emilio Gelosi

- + Italian translation

-

-Adam

- + Polish translation

-

-Nik Roby

- + Russian translation

-

-Leendert

- + Dutch translation

-

-Eric Kornblum

- + Sent me a sample DVD with LPCM tracks

-

-migol Superkid

- + Spanish translation

-

-pgjw

- + Portuguese translation

-

-cygma

- + Japanese translation

-

-Michelle De Sio

- + Sent me a sample DVD with MPEG audio tracks

-

-Ian Rickard

- + Enhanced icon

-

-S�bastien No�l

- + Debian packages (http://www.twolife.org/debian/repository.php)

-

-People who sent me an iTunes gift certificate: a BIG thanks!

-

+THANKS file for HandBrake <http://handbrake.fr/>
+
+Several people noticeably contributed to MediaFork and HandBrake development
+without writing code (submitting/checking translations, DVD samples, etc).
+Let's thank them here!
+
+Chris (audley)
+ + Inspiration and example of patching mpeg4ip for iPod atom support
+
+Omar Ahmad Bhatti
+ + Intensive beta testing, suggestions. Convinced me to port HandBrake
+   to OS X, which finally was a pretty good idea.
+
+Hanna Bauer
+Adrien Marquette
+Norbert Rittel
+ + German translation
+
+Paul B�n�chet
+Luidgi Esposito
+Andrea Gianarro
+Emilio Gelosi
+ + Italian translation
+
+Adam
+ + Polish translation
+
+Nik Roby
+ + Russian translation
+
+Leendert
+ + Dutch translation
+
+Eric Kornblum
+ + Sent me a sample DVD with LPCM tracks
+
+migol Superkid
+ + Spanish translation
+
+pgjw
+ + Portuguese translation
+
+cygma
+ + Japanese translation
+
+Michelle De Sio
+ + Sent me a sample DVD with MPEG audio tracks
+
+Ian Rickard
+ + Enhanced icon
+
+S�bastien No�l
+ + Debian packages (http://www.twolife.org/debian/repository.php)
+
+People who sent me an iTunes gift certificate: a BIG thanks!
+
diff --git a/contrib/Makefile b/contrib/Makefile
index 24d6ee243..1855ed06c 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,49 +1,49 @@
-# Contrib Makefile

-

-SYSTEM = $(shell uname -s)

-

-# Special case for Mac OS X: everything is handled from the Xcode project

-ifeq ($(SYSTEM),Darwin)

-

-all:	.contrib

-

-.contrib:

-	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; ../jam )

-

-clean:	

-	( echo "Do a make mrproper to remove the contrib libraries )

-

-mrproper: 

-	(rm -rf lib ; rm -rf include )

-

-endif

-

-ifeq ($(SYSTEM),Linux)

-

-all:	.contrib

-

-.contrib:

-	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )

-

-clean:	

-	( echo "Do a make mrproper to remove the contrib libraries )

-

-mrproper: 

-	(rm -rf lib ; rm -rf include )

-

-endif

-

-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)

-

-all:	.contrib

-

-.contrib:    

-	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )

-

-clean:

-	( echo "Do a make mrproper to remove the contrib libraries )

-

-mrproper: clean

-	(rm -rf lib ; rm -rf include ; rm -f .contrib)

-

-endif

+# Contrib Makefile
+
+SYSTEM = $(shell uname -s)
+
+# Special case for Mac OS X: everything is handled from the Xcode project
+ifeq ($(SYSTEM),Darwin)
+
+all:	.contrib
+
+.contrib:
+	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; ../jam )
+
+clean:	
+	( echo "Do a make mrproper to remove the contrib libraries )
+
+mrproper: 
+	(rm -rf lib ; rm -rf include )
+
+endif
+
+ifeq ($(SYSTEM),Linux)
+
+all:	.contrib
+
+.contrib:
+	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam )
+
+clean:	
+	( echo "Do a make mrproper to remove the contrib libraries )
+
+mrproper: 
+	(rm -rf lib ; rm -rf include )
+
+endif
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+
+all:	.contrib
+
+.contrib:    
+	( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; jam.exe )
+
+clean:
+	( echo "Do a make mrproper to remove the contrib libraries )
+
+mrproper: clean
+	(rm -rf lib ; rm -rf include ; rm -f .contrib)
+
+endif
diff --git a/test/Makefile b/test/Makefile
index dc0ac3c08..c4d4787d7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,29 +1,29 @@
-SYSTEM = $(shell uname -s)

-

-LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis \

-	   vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale theora faad

-

-all: ../HandBrakeCLI

-

-CFLAGS += -I../libhb

-CXXFLAGS += -I../libhb

-LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)

-LDFLAGS += $(LIBS2) -lbz2 -ldl

-

-../HandBrakeCLI: test.c parsecsv.c $(LIBS2)

-	@CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \

-	( echo "Compile line for $@ was:"; echo $$CMD; false )

-	@CMD="$(CC) $(CFLAGS) -o parsecsv.o -c parsecsv.c"; $$CMD || \

-	( echo "Compile line for $@ was:"; echo $$CMD; false )

-	@echo "Link HandBrakeCLI"

-	@CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.o parsecsv.o $(LDFLAGS) -lz -lpthread"; $$CMD || \

-	( echo "Compile line for $@ was:"; echo $$CMD; false )

-        @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD

-

-

-clean:

-	@echo "Clean HandBrakeCLI"

-	@$(RM) ../HandBrakeCLI 

-	@$(RM) ../HandBrakeCLI.exe

-	@$(RM) *.o

-

+SYSTEM = $(shell uname -s)
+
+LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis \
+	   vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale theora faad
+
+all: ../HandBrakeCLI
+
+CFLAGS += -I../libhb
+CXXFLAGS += -I../libhb
+LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)
+LDFLAGS += $(LIBS2) -lbz2 -ldl
+
+../HandBrakeCLI: test.c parsecsv.c $(LIBS2)
+	@CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \
+	( echo "Compile line for $@ was:"; echo $$CMD; false )
+	@CMD="$(CC) $(CFLAGS) -o parsecsv.o -c parsecsv.c"; $$CMD || \
+	( echo "Compile line for $@ was:"; echo $$CMD; false )
+	@echo "Link HandBrakeCLI"
+	@CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.o parsecsv.o $(LDFLAGS) -lz -lpthread"; $$CMD || \
+	( echo "Compile line for $@ was:"; echo $$CMD; false )
+        @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD
+
+
+clean:
+	@echo "Clean HandBrakeCLI"
+	@$(RM) ../HandBrakeCLI 
+	@$(RM) ../HandBrakeCLI.exe
+	@$(RM) *.o
+