Merge pull request #3824 from FernetMenta/aefixes

author Peter Frühberger <Peter.Fruehberger@gmail.com>

Sat, 14 Dec 2013 15:28:25 +0000 (07:28 -0800)

committer Peter Frühberger <Peter.Fruehberger@gmail.com>

Sat, 14 Dec 2013 15:28:25 +0000 (07:28 -0800)
author Peter Frühberger <Peter.Fruehberger@gmail.com>
Sat, 14 Dec 2013 15:28:25 +0000 (07:28 -0800)
committer Peter Frühberger <Peter.Fruehberger@gmail.com>
Sat, 14 Dec 2013 15:28:25 +0000 (07:28 -0800)
diff --cc xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
Simple merge
diff --cc xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h
Simple merge
diff --cc xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
Simple merge
author	Peter Frühberger <Peter.Fruehberger@gmail.com>
	Sat, 14 Dec 2013 15:28:25 +0000 (07:28 -0800)
committer	Peter Frühberger <Peter.Fruehberger@gmail.com>
	Sat, 14 Dec 2013 15:28:25 +0000 (07:28 -0800)
		1	2
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h	patch \|	diff1 \|	diff2 \|	blob \| history