Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cfdd9cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix C compatibility in header." am: e06d19ff am: de35d2de 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323276

Change-Id: Icbd8cc85f98cab4744430e968375d51e29fbbf58
parents 4fe3aea6 de35d2de

media/ndk/include/media/NdkMediaCodec.h

+2 −2
Original line number Diff line number Diff line
@@ -114,12 +114,12 @@ typedef void (*AMediaCodecOnAsyncError)( 
        int32_t actionCode,

        const char *detail);



struct AMediaCodecOnAsyncNotifyCallback {

typedef struct AMediaCodecOnAsyncNotifyCallback {

      AMediaCodecOnAsyncInputAvailable  onAsyncInputAvailable;

      AMediaCodecOnAsyncOutputAvailable onAsyncOutputAvailable;

      AMediaCodecOnAsyncFormatChanged   onAsyncFormatChanged;

      AMediaCodecOnAsyncError           onAsyncError;

};

} AMediaCodecOnAsyncNotifyCallback;



#if __ANDROID_API__ >= 21