diff options
| author | Marco Nelissen <marcone@google.com> | 2014-01-09 17:56:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-09 17:56:45 +0000 |
| commit | 0e94bd33901715bee1200a3c69d1a36d4d008b79 (patch) | |
| tree | 46961c7a4cfd35672600399d07f58a8c79e73a89 /media | |
| parent | e2b2858b6ff0249b0c3bd6cb042afc8cf1fd78cf (diff) | |
| parent | 9dfe2ae13ef557a3b6c245bc02be8b5c71ef3fa9 (diff) | |
| download | frameworks_av-0e94bd33901715bee1200a3c69d1a36d4d008b79.zip frameworks_av-0e94bd33901715bee1200a3c69d1a36d4d008b79.tar.gz frameworks_av-0e94bd33901715bee1200a3c69d1a36d4d008b79.tar.bz2 | |
am 9dfe2ae1: am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"
* commit '9dfe2ae13ef557a3b6c245bc02be8b5c71ef3fa9':
HLS: Fixed rounding error with decimal segment duration
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t M3UParser::parseMetaDataDuration( if (meta->get() == NULL) { *meta = new AMessage; } - (*meta)->setInt64(key, (int64_t)x * 1E6); + (*meta)->setInt64(key, (int64_t)(x * 1E6)); return OK; } |