diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 15:51:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-12 15:51:55 -0800 |
| commit | 394a469b587f5c61cdb9718b41e8a66c0375fcad (patch) | |
| tree | 9c042da74ca23cef51b2fc6d9f8010c8a7896b39 /Source/WebKit/android/plugins/ANPSoundInterface.cpp | |
| parent | c0bba54444c1fd03d75794b089881f964406d665 (diff) | |
| parent | 5a2206b6d2861a63585471a526dda333f68d3ebc (diff) | |
| download | external_webkit-394a469b587f5c61cdb9718b41e8a66c0375fcad.zip external_webkit-394a469b587f5c61cdb9718b41e8a66c0375fcad.tar.gz external_webkit-394a469b587f5c61cdb9718b41e8a66c0375fcad.tar.bz2 | |
Merge "Fix GPL build"
Diffstat (limited to 'Source/WebKit/android/plugins/ANPSoundInterface.cpp')
| -rw-r--r-- | Source/WebKit/android/plugins/ANPSoundInterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/plugins/ANPSoundInterface.cpp b/Source/WebKit/android/plugins/ANPSoundInterface.cpp index a4f192f..12c9176 100644 --- a/Source/WebKit/android/plugins/ANPSoundInterface.cpp +++ b/Source/WebKit/android/plugins/ANPSoundInterface.cpp @@ -71,7 +71,7 @@ static void callbackProc(int event, void* user, void* info) { src = reinterpret_cast<android::AudioTrack::Buffer*>(info); dst.bufferData = src->raw; dst.channelCount = src->channelCount; - dst.format = toANPFormat(src->format); + dst.format = toANPFormat((audio_format_t) src->format); dst.size = src->size; track->mProc(kMoreData_ANPAudioEvent, track->mUser, &dst); // return the updated size field |