Matthew Hoops a1d41da096 Merge remote branch 'upstream/master' into t7g-ios ...

Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h

2011-05-11 00:30:28 -04:00

..

aac.cpp

Merge remote branch 'upstream/master' into t7g-ios

2011-05-11 00:30:28 -04:00

aac.h

AUDIO: Add support for AAC audio

2011-04-10 14:51:24 -04:00

adpcm_intern.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

adpcm.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

adpcm.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

aiff.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

aiff.h

JANITORIAL: Format forward declarations to follow convention

2011-04-28 12:20:34 +03:00

flac.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

flac.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

iff_sound.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

iff_sound.h

JANITORIAL: Format forward declarations to follow convention

2011-04-28 12:20:34 +03:00

mac_snd.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

mac_snd.h

JANITORIAL: Format forward declarations to follow convention

2011-04-28 12:20:34 +03:00

mp3.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

mp3.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

qdm2.cpp

Merge remote branch 'upstream/master' into t7g-ios

2011-05-11 00:30:28 -04:00

qdm2.h

Merge remote branch 'upstream/master' into t7g-ios

2011-05-11 00:30:28 -04:00

qdm2data.h

AUDIO: Split QuickTime audio into a new class

2011-04-07 19:40:07 -04:00

quicktime_intern.h

AUDIO: Split the QuickTimeAudioDecoder into a new header file

2011-04-14 10:25:02 -04:00

quicktime.cpp

Merge remote branch 'upstream/master' into t7g-ios

2011-05-11 00:30:28 -04:00

quicktime.h

AUDIO: Split the QuickTimeAudioDecoder into a new header file

2011-04-14 10:25:02 -04:00

raw.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

raw.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

vag.cpp

AUDIO: Rename sound/ dir to audio/

2011-02-09 01:09:01 +00:00

vag.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

voc.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

voc.h

JANITORIAL: Format forward declarations to follow convention

2011-04-28 12:20:34 +03:00

vorbis.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

vorbis.h

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

wave.cpp

JANITORIAL: Reduce header dependencies in shared code

2011-04-28 15:08:58 +03:00

wave.h

JANITORIAL: Format forward declarations to follow convention

2011-04-28 12:20:34 +03:00