diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 19:03:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:03:57 +0000 |
| commit | 243a42a7993761845e7042f1845de50aba2ffc7a (patch) | |
| tree | d6093bcad572c7eacfe59592e179e933cd1271b9 /media/jni | |
| parent | b30866681475aff8fd23841dbadf1d39e0001e20 (diff) | |
| parent | 43ea037b4c61e332d7419ac069a62e314166fdd7 (diff) | |
| download | frameworks_base-243a42a7993761845e7042f1845de50aba2ffc7a.zip frameworks_base-243a42a7993761845e7042f1845de50aba2ffc7a.tar.gz frameworks_base-243a42a7993761845e7042f1845de50aba2ffc7a.tar.bz2 | |
am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
Fix class vs. struct mismatch
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaExtractor.h | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaHTTPConnection.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/jni/android_media_MediaExtractor.h b/media/jni/android_media_MediaExtractor.h index e5a0c16e..9f62506 100644 --- a/media/jni/android_media_MediaExtractor.h +++ b/media/jni/android_media_MediaExtractor.h @@ -30,7 +30,7 @@ namespace android { struct IMediaHTTPService; -struct MetaData; +class MetaData; struct NuMediaExtractor; struct JMediaExtractor : public RefBase { diff --git a/media/jni/android_media_MediaHTTPConnection.h b/media/jni/android_media_MediaHTTPConnection.h index 62ff678..f87f1eb 100644 --- a/media/jni/android_media_MediaHTTPConnection.h +++ b/media/jni/android_media_MediaHTTPConnection.h @@ -24,8 +24,8 @@ namespace android { -struct IMemory; -struct MemoryDealer; +class IMemory; +class MemoryDealer; struct JMediaHTTPConnection : public RefBase { enum { |