summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-12-01 17:57:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 17:57:32 +0000
commit42495ddc3501c947441f892a56f2ac9ee96d7082 (patch)
tree2c6c19af8fc6d6ccae0a731c2c16c3bf0e125047 /media/libstagefright
parente5ba80c5c802ddad57e1132675c32b479c16758a (diff)
parent592f3bc86d6f0aceb408961eae3cced1c2203af9 (diff)
downloadframeworks_av-42495ddc3501c947441f892a56f2ac9ee96d7082.zip
frameworks_av-42495ddc3501c947441f892a56f2ac9ee96d7082.tar.gz
frameworks_av-42495ddc3501c947441f892a56f2ac9ee96d7082.tar.bz2
am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"
* commit '592f3bc86d6f0aceb408961eae3cced1c2203af9': 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 821bd81..aeb8dd7 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -804,6 +804,7 @@ void parseVorbisComment(
{ "TRACKNUMBER", kKeyCDTrackNumber },
{ "DISCNUMBER", kKeyDiscNumber },
{ "DATE", kKeyDate },
+ { "YEAR", kKeyYear },
{ "LYRICIST", kKeyWriter },
{ "METADATA_BLOCK_PICTURE", kKeyAlbumArt },
{ "ANDROID_LOOP", kKeyAutoLoop },