summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-11-07 08:29:30 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-07 08:29:31 -0800
commit891b11da870ad3f860c1d2610ef4d8836ed6c590 (patch)
treee6b9b1be319590d43afc496a55d779724b3db10c /include/media
parentb2800e8f1360cbc3c5af2bea228b9622b1ddc9dd (diff)
parentc26741598a840f7c1d12ee457fb26f68fcdbcc70 (diff)
downloadframeworks_av-891b11da870ad3f860c1d2610ef4d8836ed6c590.zip
frameworks_av-891b11da870ad3f860c1d2610ef4d8836ed6c590.tar.gz
frameworks_av-891b11da870ad3f860c1d2610ef4d8836ed6c590.tar.bz2
Merge "Remove CBLK_FAST from control block flags"
Diffstat (limited to 'include/media')
-rw-r--r--include/media/IAudioFlinger.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h
index 359780e..0aa48c6 100644
--- a/include/media/IAudioFlinger.h
+++ b/include/media/IAudioFlinger.h
@@ -62,7 +62,7 @@ public:
audio_format_t format,
audio_channel_mask_t channelMask,
int frameCount,
- track_flags_t flags,
+ track_flags_t *flags,
const sp<IMemory>& sharedBuffer,
audio_io_handle_t output,
pid_t tid, // -1 means unused, otherwise must be valid non-0