commit | fac344fd091d822410133d8401bdc507a496fbba | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jun 03 22:41:16 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 03 22:41:16 2020 +0000 |
tree | 9b3fe5bbeff68933cc5563c6a7928ee57378047a | |
parent | 81b1f6f8fb11502c5e2328076d67c75afb2114d4 [diff] | |
parent | 91e6aaf902bb112d181884b3951208a2b73985eb [diff] |
Merge "Fix C compatibility in header." am: e06d19ff2c am: de35d2de57 am: 2cfdd9cd30 am: 91e6aaf902 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323276 Change-Id: I86280258e7435c0563a7f479ea9947d53f6f9c4e
diff --git a/media/ndk/include/media/NdkMediaCodec.h b/media/ndk/include/media/NdkMediaCodec.h index 8fb6a87..80d5d50 100644 --- a/media/ndk/include/media/NdkMediaCodec.h +++ b/media/ndk/include/media/NdkMediaCodec.h
@@ -114,12 +114,12 @@ int32_t actionCode, const char *detail); -struct AMediaCodecOnAsyncNotifyCallback { +typedef struct AMediaCodecOnAsyncNotifyCallback { AMediaCodecOnAsyncInputAvailable onAsyncInputAvailable; AMediaCodecOnAsyncOutputAvailable onAsyncOutputAvailable; AMediaCodecOnAsyncFormatChanged onAsyncFormatChanged; AMediaCodecOnAsyncError onAsyncError; -}; +} AMediaCodecOnAsyncNotifyCallback; #if __ANDROID_API__ >= 21