diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-17 20:27:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:27:28 +0000 |
| commit | 1c39c28ed6537cab06d681f8f3c0a4d17bb0543d (patch) | |
| tree | 02c18278dbd2755e036da67904d5b1c38c95942d /media/libstagefright/mpeg2ts | |
| parent | 98d78d1579d3702d7a94dd7d582d1cd99e35f22e (diff) | |
| parent | 8c5ee61a057e3b87e8f0800b284642bf3b107fd0 (diff) | |
| download | frameworks_av-1c39c28ed6537cab06d681f8f3c0a4d17bb0543d.zip frameworks_av-1c39c28ed6537cab06d681f8f3c0a4d17bb0543d.tar.gz frameworks_av-1c39c28ed6537cab06d681f8f3c0a4d17bb0543d.tar.bz2 | |
am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"
* commit '8c5ee61a057e3b87e8f0800b284642bf3b107fd0':
Fix struct vs. class mismatches
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.h b/media/libstagefright/mpeg2ts/ATSParser.h index 5d76cbd..75d76dc 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.h +++ b/media/libstagefright/mpeg2ts/ATSParser.h @@ -28,7 +28,7 @@ namespace android { -struct ABitReader; +class ABitReader; struct ABuffer; struct MediaSource; diff --git a/media/libstagefright/mpeg2ts/ESQueue.h b/media/libstagefright/mpeg2ts/ESQueue.h index a2cca77..45b4624 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.h +++ b/media/libstagefright/mpeg2ts/ESQueue.h @@ -26,7 +26,7 @@ namespace android { struct ABuffer; -struct MetaData; +class MetaData; struct ElementaryStreamQueue { enum Mode { |