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

Commit 9a612023 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 am:... 

Merge "Fix C compatibility in header." am: e06d19ff am: de35d2de am: 2cfdd9cd am: 91e6aaf9 am: fac344fd

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

Change-Id: Ieb960ac271ae4efa210539d3d307f7cd26b77499
parents 2534713d fac344fd

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