diff options
| author | Gloria Wang <gwang@google.com> | 2011-06-27 11:09:00 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-07-01 16:52:28 -0700 |
| commit | 0d0edfb024f65f7e1097bf1814ae229ce9cb367d (patch) | |
| tree | b8995cf55d54f9f357b414a4b3285ad2d16285d9 /media/libstagefright/include/MPEG4Extractor.h | |
| parent | 69c2b29eb72396068b9d116c2a54f283025c7d6b (diff) | |
| download | frameworks_av-0d0edfb024f65f7e1097bf1814ae229ce9cb367d.zip frameworks_av-0d0edfb024f65f7e1097bf1814ae229ce9cb367d.tar.gz frameworks_av-0d0edfb024f65f7e1097bf1814ae229ce9cb367d.tar.bz2 | |
- Retrieve is_drm in MediaMetadataRetriever.
- Add one more column in MediaStore to indicate whether a
media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager
Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
Diffstat (limited to 'media/libstagefright/include/MPEG4Extractor.h')
| -rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index 3bd4c7e..eae62c6 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -40,7 +40,6 @@ public: virtual sp<MetaData> getMetaData(); // for DRM - virtual void setDrmFlag(bool flag); virtual char* getDrmTrackInfo(size_t trackID, int *len); protected: |