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 | 90fc6105cf504bf8e5eabc33a8d35b70a91795d2 (patch) | |
| tree | 0aaece11165e0f40ef9e5704fa995a4e8e6f0043 /media/libstagefright | |
| parent | 5820e52f9bf3c40839d33457975b6c9629ab1c79 (diff) | |
| parent | 21af757836167a328ddf1c0381909d53941528c4 (diff) | |
| download | frameworks_av-90fc6105cf504bf8e5eabc33a8d35b70a91795d2.zip frameworks_av-90fc6105cf504bf8e5eabc33a8d35b70a91795d2.tar.gz frameworks_av-90fc6105cf504bf8e5eabc33a8d35b70a91795d2.tar.bz2 | |
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
Diffstat (limited to 'media/libstagefright')
| -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); |