diff options
| author | 2011-11-29 16:33:02 -0800 | |
|---|---|---|
| committer | 2011-11-29 16:33:02 -0800 | |
| commit | 848bffd8fa07f0e16d0ac5eed95085288ff43d9f (patch) | |
| tree | b7ef7703f0a0b33df7d6a263c8cb3bfb5c371d9b /media/libmedia/IStreamSource.cpp | |
| parent | baeda5135bb1b4a87334c41834f3532ab73a4022 (diff) | |
| parent | 074133b260f8d12e484e93b9aa5a33a4983b7349 (diff) | |
am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '074133b260f8d12e484e93b9aa5a33a4983b7349':
Updated (internal) API for IStreamSource to signal discontinuities
Diffstat (limited to 'media/libmedia/IStreamSource.cpp')
| -rw-r--r-- | media/libmedia/IStreamSource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/IStreamSource.cpp b/media/libmedia/IStreamSource.cpp index b311f3522518..078be9446c88 100644 --- a/media/libmedia/IStreamSource.cpp +++ b/media/libmedia/IStreamSource.cpp @@ -30,7 +30,7 @@ namespace android { const char *const IStreamListener::kKeyResumeAtPTS = "resume-at-PTS"; // static -const char *const IStreamListener::kKeyFormatChange = "format-change"; +const char *const IStreamListener::kKeyDiscontinuityMask = "discontinuity-mask"; enum { // IStreamSource |