diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:30:27 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:30:27 -0800 |
| commit | 001a7b82e04646682170d4b946529ebc0b956c16 (patch) | |
| tree | fb3784437f93380f21b6d69e9c819fc1305104da /media/libmedia/IStreamSource.cpp | |
| parent | d852697190e617c43930723bbb446375394b4194 (diff) | |
| parent | f0ff908da019a44115109f1b4d1b6864b35a8a29 (diff) | |
| download | frameworks_av-001a7b82e04646682170d4b946529ebc0b956c16.zip frameworks_av-001a7b82e04646682170d4b946529ebc0b956c16.tar.gz frameworks_av-001a7b82e04646682170d4b946529ebc0b956c16.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/av into 1.1
Android 4.2.2 release 1
Diffstat (limited to 'media/libmedia/IStreamSource.cpp')
| -rw-r--r-- | media/libmedia/IStreamSource.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmedia/IStreamSource.cpp b/media/libmedia/IStreamSource.cpp index 78d810d..68ffca8 100644 --- a/media/libmedia/IStreamSource.cpp +++ b/media/libmedia/IStreamSource.cpp @@ -32,6 +32,9 @@ const char *const IStreamListener::kKeyResumeAtPTS = "resume-at-PTS"; // static const char *const IStreamListener::kKeyDiscontinuityMask = "discontinuity-mask"; +// static +const char *const IStreamListener::kKeyMediaTimeUs = "media-time-us"; + enum { // IStreamSource SET_LISTENER = IBinder::FIRST_CALL_TRANSACTION, |