commit 586dda1d0845612af88e3f4ffc46ed38e304ef85
author Marco Nelissen <marcone@google.com> Thu Jan 09 09:50:14 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 09 09:50:14 2014 -0800
tree 9328d0a0984226824c21559eaf571af1f7f4f79d
parent f60cfa7faa0bdde0a4f302f1272d6aa869588cc4
parent 5ca94d2f3c4662aed7b66a97b77eb2d1948464ad

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

* commit '5ca94d2f3c4662aed7b66a97b77eb2d1948464ad':
  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;
 }