commit d4602e79e84883ade696b024aa28512a74bccfb6
author Dichen Zhang <dichenzhang@google.com> Wed Feb 20 16:12:06 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 16:12:06 2019 -0800
tree 924ff98846b478e996c8d0c69d2f96b780396977
parent 268a5dbc5e1146fa24f520be36577b5cfe93c148
parent 0b96fa14b8441707e1a789bf3ee1a5b70c105643

Merge "media: fixing klock work issue." am: 1b7026ed1e am: 6f2779da0f
am: 0b96fa14b8

Change-Id: I2bd06479faa495577a0aa5202a05894fee3b9691

media/libstagefright/FrameDecoder.cpp

diff --git a/media/libstagefright/FrameDecoder.cpp b/media/libstagefright/FrameDecoder.cpp
index 42b98b1..18a6bd8 100644
--- a/media/libstagefright/FrameDecoder.cpp
+++ b/media/libstagefright/FrameDecoder.cpp
@@ -431,7 +431,7 @@
             || !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_HEVC);
 
     if (frameTimeUs < 0) {
-        int64_t thumbNailTime;
+        int64_t thumbNailTime = -1ll;
         if (!trackMeta()->findInt64(kKeyThumbnailTime, &thumbNailTime)
                 || thumbNailTime < 0) {
             thumbNailTime = 0;