commit 9dfe2ae13ef557a3b6c245bc02be8b5c71ef3fa9
author Marco Nelissen <marcone@google.com> Thu Jan 09 17:54:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 09 17:54:13 2014 +0000
tree 9328d0a0984226824c21559eaf571af1f7f4f79d
parent f41d9bc92410784fc12fa15a544282c06da76008
parent 586dda1d0845612af88e3f4ffc46ed38e304ef85

am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"

* commit '586dda1d0845612af88e3f4ffc46ed38e304ef85':
  HLS: Fixed rounding error with decimal segment duration

media/libstagefright/httplive/M3UParser.cpp

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 243888c..dd248cb 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -608,7 +608,7 @@
     if (meta->get() == NULL) {
         *meta = new AMessage;
     }
-    (*meta)->setInt64(key, (int64_t)x * 1E6);
+    (*meta)->setInt64(key, (int64_t)(x * 1E6));
 
     return OK;
 }