diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-17 20:07:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:07:50 +0000 |
| commit | 8c5ee61a057e3b87e8f0800b284642bf3b107fd0 (patch) | |
| tree | 9ccc1ab733f8d17f535d455864206a024f8be2c1 /media/libmediaplayerservice/nuplayer | |
| parent | f1b0c671e85d7ad5e1aa94d16336cda57158cd33 (diff) | |
| parent | d86450b93ab3960ccd68aed14563aaa76b43ce9b (diff) | |
| download | frameworks_av-8c5ee61a057e3b87e8f0800b284642bf3b107fd0.zip frameworks_av-8c5ee61a057e3b87e8f0800b284642bf3b107fd0.tar.gz frameworks_av-8c5ee61a057e3b87e8f0800b284642bf3b107fd0.tar.bz2 | |
am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"
* commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b':
Fix struct vs. class mismatches
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerSource.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 5f6deee..7175e15 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -26,7 +26,7 @@ namespace android { struct ABuffer; struct AMessage; -struct MetaData; +class MetaData; struct NuPlayerDriver; struct NuPlayer : public AHandler { diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h index 2f06c31..9924f18 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h @@ -28,7 +28,6 @@ namespace android { struct ABuffer; -struct MetaData; struct MediaBuffer; struct NuPlayer::Source : public AHandler { |