summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-12-01 18:03:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 18:03:15 +0000
commitd03179ac50bc59129215e9272129665da24a27cc (patch)
treef75edf5cd2e74d1b65e1d3893c4ab681fcbe11ab /media
parent5a88501c8f677e34afb2043d7e81d8e09d6fa5f4 (diff)
parent42495ddc3501c947441f892a56f2ac9ee96d7082 (diff)
downloadframeworks_av-d03179ac50bc59129215e9272129665da24a27cc.zip
frameworks_av-d03179ac50bc59129215e9272129665da24a27cc.tar.gz
frameworks_av-d03179ac50bc59129215e9272129665da24a27cc.tar.bz2
am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"
* commit '42495ddc3501c947441f892a56f2ac9ee96d7082': Added support for YEAR metadata key from VorbisComments
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/OggExtractor.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index 6219053..bd28583 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -851,6 +851,7 @@ void parseVorbisComment(
{ "TRACKNUMBER", kKeyCDTrackNumber },
{ "DISCNUMBER", kKeyDiscNumber },
{ "DATE", kKeyDate },
+ { "YEAR", kKeyYear },
{ "LYRICIST", kKeyWriter },
{ "METADATA_BLOCK_PICTURE", kKeyAlbumArt },
{ "ANDROID_LOOP", kKeyAutoLoop },