summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-12-01 18:09:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 18:09:18 +0000
commitb43ec13b603769d64d300716ffc8914fb39e30c5 (patch)
treef2ab7de64090ac3d3e3c9dc3e9ac5bf95be32086 /media/libstagefright
parent9014f5909920f2bb88687364876c1f7eaa014583 (diff)
parentd03179ac50bc59129215e9272129665da24a27cc (diff)
downloadframeworks_av-b43ec13b603769d64d300716ffc8914fb39e30c5.zip
frameworks_av-b43ec13b603769d64d300716ffc8914fb39e30c5.tar.gz
frameworks_av-b43ec13b603769d64d300716ffc8914fb39e30c5.tar.bz2
am d03179ac: am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"
* commit 'd03179ac50bc59129215e9272129665da24a27cc': Added support for YEAR metadata key from VorbisComments
Diffstat (limited to 'media/libstagefright')
-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 },