diff options
| author | Robert Shih <robertshih@google.com> | 2015-05-15 22:33:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 22:33:23 +0000 |
| commit | eca012646226d397a7076ff8d6da026db5d11d5b (patch) | |
| tree | ffb9c02a2c6859c18dafe5713c5f59d08d4bf3dd /include | |
| parent | 641d56b15d11ba806b60f1f32543444016bf045a (diff) | |
| parent | 6f9c5e26c710dbee50e57316f1c460dda4850fa5 (diff) | |
| download | frameworks_av-eca012646226d397a7076ff8d6da026db5d11d5b.zip frameworks_av-eca012646226d397a7076ff8d6da026db5d11d5b.tar.gz frameworks_av-eca012646226d397a7076ff8d6da026db5d11d5b.tar.bz2 | |
Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 3b58122..21eb04a 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -64,7 +64,7 @@ extern const char *MEDIA_MIMETYPE_TEXT_3GPP; extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP; extern const char *MEDIA_MIMETYPE_TEXT_VTT; extern const char *MEDIA_MIMETYPE_TEXT_CEA_608; -extern const char *MEDIA_MIMETYPE_DATA_METADATA; +extern const char *MEDIA_MIMETYPE_DATA_TIMED_ID3; } // namespace android |