| commit | 9a612023b3255ca28c0c6efb8fe7f6f4dfe42ab3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jun 03 23:03:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 03 23:03:08 2020 +0000 |
| tree | 2a02c323e216561dae30035fa97bd12bc63f3c02 | |
| parent | 2534713d78910184579b8dfa7d4881630f039104 [diff] | |
| parent | fac344fd091d822410133d8401bdc507a496fbba [diff] |
Merge "Fix C compatibility in header." am: e06d19ff2c am: de35d2de57 am: 2cfdd9cd30 am: 91e6aaf902 am: fac344fd09 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323276 Change-Id: Ieb960ac271ae4efa210539d3d307f7cd26b77499
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