diff options
| author | Wei Jia <wjia@google.com> | 2014-09-16 02:26:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-16 02:26:44 +0000 |
| commit | 086c1e3f41a92aa0025a1da1db5dabbfdffaf129 (patch) | |
| tree | 38a0dd8ba744cc9aeea9e9f61a975310daeadf13 /media/libstagefright | |
| parent | 9299a6873a4b909357e031361055a888843619da (diff) | |
| parent | f4eadb67ba9130b583b8f2f192276b53fa3d50bc (diff) | |
| download | frameworks_av-086c1e3f41a92aa0025a1da1db5dabbfdffaf129.zip frameworks_av-086c1e3f41a92aa0025a1da1db5dabbfdffaf129.tar.gz frameworks_av-086c1e3f41a92aa0025a1da1db5dabbfdffaf129.tar.bz2 | |
Merge "ASessionDescription: allow open-ended NTP range." into lmp-dev
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/rtsp/ASessionDescription.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp index a9b3330..98498e9 100644 --- a/media/libstagefright/rtsp/ASessionDescription.cpp +++ b/media/libstagefright/rtsp/ASessionDescription.cpp @@ -319,6 +319,11 @@ bool ASessionDescription::parseNTPRange( s = end + 1; // skip the dash. + if (*s == '\0') { + *npt2 = FLT_MAX; // open ended. + return true; + } + if (!strncmp("now", s, 3)) { return false; // no absolute end time available } |