commit | 6d0b4669351e7ffce48c601964acd58814a4a493 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Mon Oct 03 20:23:40 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 03 20:23:40 2016 +0000 |
tree | 85c982737c58959a29bdaaa2ca57bd7b8da055f1 | |
parent | f48d0b8f19f09e9bee74f62a48e39b1001697359 [diff] | |
parent | 8f1011d584664fffdaeccbcc1ee108df9474c5b5 [diff] |
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 Change-Id: I259197408884f11e61f61e5241ee0012de28b54f
diff --git a/media/jni/android_media_MediaCodec.h b/media/jni/android_media_MediaCodec.h index c0c47ef..d68bb53 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;