Merge the 5.1 branch into the trunk.

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

1 files changed, 68 insertions, 59 deletions

diff --git a/AUTHORS b/AUTHORS
index 1c26aa4ee..6139b522d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,59 +1,68 @@
-AUTHORS file for HandBrake <http://handbrake.m0k.org/>
-
-Eric Petit <[email protected]>
- + Core (construct, multithreading, BeOS/OS X/Linux ports)
- + MPEG demuxer
- + MPEG-2, AC3 and MPGA decoders (w/ libmpeg2/liba52/libavcodec)
- + LPCM "decoder"
- + MPEG-4, MP3 and AAC encoders (w/ libavcodec/libxvidcore/libmp3lame/
-   libfaac)
- + AC-3 pass-through
- + AVI muxer
- + MP4 muxer (w/ libmp4v2)
- + BeOS interface
- + OS X interface
- + French translation
-
-Laurent Aimar <[email protected]>
- + H264 and Vorbis encoders (w/ libx264/libvorbis)
- + OGG/OGM muxer (w/ libogg)
- + Gtk2 interface
- + wxWidgets interface
-
-John Allen (?) <[email protected]> (johnallen)
- + Core enhancements
- + Threading enhancements
- + Simplified Mac OS X GUI
-
-Joe Crain <[email protected]> (dynaflash)
- + Mac OS X GUI enhancements/rewrite
-
-Rodney Hester <[email protected]> (rhester)
- + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support
-
-Benjamin Lake <[email protected]> (benlake)
- + Mac OS X GUI enhancements/rewrite
-
-Chris Long <[email protected]> (chrislong)
- + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support
-
-Philippe Rigaux <[email protected]> (prigaux)
- + 3rd party library integration
- + Mac OS X GUI enhancements
- + PAR/anamorphic support
- + Universal binary build process
- + Conversion from jam to make for compiles
-
-Jonathon Rubin <[email protected]> (jbrjake)
- + Massive core enhancements
- + Significant improvements to H.264 support
-
-Scott <[email protected]> (sr55)
- + Windows GUI
- + mpeg4ip patches for cygwin compile
-
-Unknown <[email protected]> (maurj)
- + AAC audio improvements
-
-Unknown <[email protected]> (mirkwood)
- + Windows CLI port
+AUTHORS file for MediaFork <http://mediafork.dynalias.com/>

+

+Originally forked from HandBrake <http://handbrake.m0k.org/>

+

+Eric Petit <[email protected]>

+ + Core (construct, multithreading, BeOS/OS X/Linux ports)

+ + MPEG demuxer

+ + MPEG-2, AC3 and MPGA decoders (w/ libmpeg2/liba52/libavcodec)

+ + LPCM "decoder"

+ + MPEG-4, MP3 and AAC encoders (w/ libavcodec/libxvidcore/libmp3lame/

+   libfaac)

+ + AC-3 pass-through

+ + AVI muxer

+ + MP4 muxer (w/ libmp4v2)

+ + BeOS interface

+ + OS X interface

+ + French translation

+

+Laurent Aimar <[email protected]>

+ + H264 and Vorbis encoders (w/ libx264/libvorbis)

+ + OGG/OGM muxer (w/ libogg)

+ + Gtk2 interface

+ + wxWidgets interface

+

+John Allen (?) <[email protected]> (johnallen)

+ + Core enhancements

+ + Threading enhancements

+ + Simplified Mac OS X GUI

+

+Joe Crain <[email protected]> (dynaflash)

+ + Mac OS X GUI enhancements/rewrite

+

+Rodney Hester <[email protected]> (rhester)

+ + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support

+

+Benjamin Lake <[email protected]> (benlake)

+ + Mac OS X GUI enhancements/rewrite

+

+Chris Lee <[email protected]>

+ + PAR/anamorphic support

+ + dvdread enhancements

+ + Linux GUI

+

+Chris Long <[email protected]> (chrislong)

+ + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support

+

+Philippe Rigaux <[email protected]> (prigaux)

+ + 3rd party library integration

+ + Mac OS X GUI enhancements

+ + PAR/anamorphic support

+ + Universal binary build process

+ + Conversion from jam to make for compiles

+

+Jonathon Rubin <[email protected]> (jbrjake)

+ + Massive core enhancements

+ + Significant improvements to H.264 support

+

+Scott <[email protected]> (sr55)

+ + Windows GUI

+ + mpeg4ip patches for cygwin compile

+

+Maurj <[email protected]> (maurj)

+ + 6-channel AAC audio from 5.1 source

+ + mono AAC audio from mono source

+ + PAR/anamorphic support in mp4 file format

+

+Unknown <[email protected]> (mirkwood)

+ + Windows CLI port