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 /media/libstagefright/httplive | |
| 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 'media/libstagefright/httplive')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 64a8532..27509cb 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -1406,7 +1406,7 @@ sp<AMessage> LiveSession::getTrackInfo(size_t trackIndex) const { sp<AMessage> format = new AMessage(); format->setInt32("type", MEDIA_TRACK_TYPE_METADATA); format->setString("language", "und"); - format->setString("mime", MEDIA_MIMETYPE_DATA_METADATA); + format->setString("mime", MEDIA_MIMETYPE_DATA_TIMED_ID3); return format; } return mPlaylist->getTrackInfo(trackIndex); |