diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-02 14:48:41 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-10-02 14:48:41 -0700 |
| commit | 6d4d3c2c99f0beccf2dd5db31ba8e016efc98e69 (patch) | |
| tree | e298897aa24d6e75b3a4e96f03ddf7a01ef997c7 /media/libstagefright/timedtext | |
| parent | 8f32cc216c59a513c957ea0d3ccab9960d459722 (diff) | |
| parent | c51e512ae6341326a584d65e93b3bd1a8190ad05 (diff) | |
| download | frameworks_av-6d4d3c2c99f0beccf2dd5db31ba8e016efc98e69.zip frameworks_av-6d4d3c2c99f0beccf2dd5db31ba8e016efc98e69.tar.gz frameworks_av-6d4d3c2c99f0beccf2dd5db31ba8e016efc98e69.tar.bz2 | |
resolved conflicts for merge of c51e512a to lmp-dev-plus-aosp
Change-Id: I84fae98361d1e2606e5ac2014ae9eef70c884d0e
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; |