OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d224ee5 4361749)
am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required"
authorGlenn Kasten <gkasten@android.com>
Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +0000)
* commit '4361749d74113069aafb0620a1189404205c58d0':
  AudioTrack: Never try to use the fast path if resampling is required

1  2 
media/libmedia/AudioTrack.cpp patch | diff1 | diff2 | blob | history
services/audioflinger/Threads.cpp patch | diff1 | diff2 | blob | history

diff --cc media/libmedia/AudioTrack.cpp
Simple merge
diff --cc services/audioflinger/Threads.cpp
Simple merge
frameworks/av
About OSDN
Find Software
Develop Software
Help