Merge pull request #4899 from Memphiz/osxsinkphysicalformat
authorjmarshallnz <jcmarsha@gmail.com>
Thu, 12 Jun 2014 21:03:58 +0000 (09:03 +1200)
committerJonathan Marshall <jmarshall@xbmc.org>
Sun, 15 Jun 2014 04:25:16 +0000 (16:25 +1200)
commitdb729cc4cbeb1d342d7e7d5e687e4d81c7da2c21
treea155cf7fe5e1255e89b7d8c666fd8b8f4ba108a6
parent2c1ab81c341dd1c039f9189ad3af1255b56f5f58
Merge pull request #4899 from Memphiz/osxsinkphysicalformat

[AE/osxsink] - don't set the altered outputformat which might have wrong channel count
Conflicts:
xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp