diff options
| author | Andreas Huber <andih@google.com> | 2011-04-12 08:36:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-12 08:36:59 -0700 |
| commit | dfad483298e01145dc40f48ba334ce7f87640647 (patch) | |
| tree | 3c808cda98101bca8a60b787d7fb2698017cb54a /media | |
| parent | 2ab632a67ef4ac2c65d186238e98f2c2a1b5285a (diff) | |
| parent | 87312e9a810f31a3de76eb7b41165fc02f552cc3 (diff) | |
| download | frameworks_base-dfad483298e01145dc40f48ba334ce7f87640647.zip frameworks_base-dfad483298e01145dc40f48ba334ce7f87640647.tar.gz frameworks_base-dfad483298e01145dc40f48ba334ce7f87640647.tar.bz2 | |
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index 4095fbf..7621f2c 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -146,7 +146,8 @@ static VideoFrame *extractVideoFrameWithCodecFlags( int64_t thumbNailTime; if (frameTimeUs < 0) { - if (!trackMeta->findInt64(kKeyThumbnailTime, &thumbNailTime)) { + if (!trackMeta->findInt64(kKeyThumbnailTime, &thumbNailTime) + || thumbNailTime < 0) { thumbNailTime = 0; } options.setSeekTo(thumbNailTime, mode); |