diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-10-02 20:39:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-02 20:39:26 +0000 |
| commit | c8871d2cce58f7fa0985d4ace5fec73d468b1afd (patch) | |
| tree | fa4d909ee1fa1ba49ae72aa6d6131b778dfeef8f /media | |
| parent | 95fd067cc8dc8cd10bd14dba5bc2000600c75449 (diff) | |
| parent | f9c01190b1305d5602ca799003d9dcaed4feb10d (diff) | |
| download | frameworks_av-c8871d2cce58f7fa0985d4ace5fec73d468b1afd.zip frameworks_av-c8871d2cce58f7fa0985d4ace5fec73d468b1afd.tar.gz frameworks_av-c8871d2cce58f7fa0985d4ace5fec73d468b1afd.tar.bz2 | |
Merge "Fix struct vs. class mismatches"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextPlayer.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextSRTSource.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.h b/media/libstagefright/matroska/MatroskaExtractor.h index 1294b4f..5bc5338 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.h +++ b/media/libstagefright/matroska/MatroskaExtractor.h @@ -23,7 +23,7 @@ #include <utils/threads.h> namespace mkvparser { -struct Segment; +class Segment; }; namespace android { 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; |