| commit | a543ca6c05a52537814d9719ac55f44e3bc11e3c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Oct 03 20:35:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 03 20:35:12 2016 +0000 |
| tree | 8f458a21170d49474a5dc90b6076af693c0ea2b7 | |
| parent | dbfd183fdc16660a66339edaa4c360c9f5615690 [diff] | |
| parent | e9b5b7011442a20728c64704a6f35c2ddc3420c5 [diff] |
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935 am: 95311818f0 am: e9b5b70114 Change-Id: I80205377a19c45927a11fc14ab72c13a7479570b
diff --git a/media/jni/android_media_MediaCodec.h b/media/jni/android_media_MediaCodec.h index 88b566a..5f0d3df 100644 --- a/media/jni/android_media_MediaCodec.h +++ b/media/jni/android_media_MediaCodec.h
@@ -31,7 +31,7 @@ struct AMessage; struct AString; struct ICrypto; -struct IGraphicBufferProducer; +class IGraphicBufferProducer; struct MediaCodec; struct PersistentSurface; class Surface;