diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-10-02 20:42:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 20:42:27 +0000 |
| commit | c51e512ae6341326a584d65e93b3bd1a8190ad05 (patch) | |
| tree | 7b6dab2e4178b28ea9191d975bfce149c6645640 /media/libstagefright/timedtext | |
| parent | 912285971c9bdb358b1fc06a7ea320fc8f001d5c (diff) | |
| parent | c8871d2cce58f7fa0985d4ace5fec73d468b1afd (diff) | |
| download | frameworks_av-c51e512ae6341326a584d65e93b3bd1a8190ad05.zip frameworks_av-c51e512ae6341326a584d65e93b3bd1a8190ad05.tar.gz frameworks_av-c51e512ae6341326a584d65e93b3bd1a8190ad05.tar.bz2 | |
am c8871d2c: Merge "Fix struct vs. class mismatches"
* commit 'c8871d2cce58f7fa0985d4ace5fec73d468b1afd':
Fix struct vs. class mismatches
Diffstat (limited to 'media/libstagefright/timedtext')
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextPlayer.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextSRTSource.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/timedtext/TimedTextPlayer.h b/media/libstagefright/timedtext/TimedTextPlayer.h index ec8ed25..9cb49ec 100644 --- a/media/libstagefright/timedtext/TimedTextPlayer.h +++ b/media/libstagefright/timedtext/TimedTextPlayer.h @@ -27,7 +27,7 @@ namespace android { -class AMessage; +struct AMessage; class MediaPlayerBase; class TimedTextDriver; class TimedTextSource; diff --git a/media/libstagefright/timedtext/TimedTextSRTSource.h b/media/libstagefright/timedtext/TimedTextSRTSource.h index 598c200..232675e 100644 --- a/media/libstagefright/timedtext/TimedTextSRTSource.h +++ b/media/libstagefright/timedtext/TimedTextSRTSource.h @@ -25,7 +25,7 @@ namespace android { -class AString; +struct AString; class DataSource; class MediaBuffer; class Parcel; |