diff options
| author | Andreas Huber <andih@google.com> | 2011-11-29 16:33:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 16:33:02 -0800 |
| commit | c089d02cf2bddf1bba6eaa2b2fcce149dc44633e (patch) | |
| tree | b1370ec48d21e9052eb0b040814f91638ebc3a18 /media/libmedia | |
| parent | eca36b5a1759970bc3d0373d72d6fec7c9b7e944 (diff) | |
| parent | 6bf045c85526312b198733ac8113cc213c8d79c9 (diff) | |
| download | frameworks_av-c089d02cf2bddf1bba6eaa2b2fcce149dc44633e.zip frameworks_av-c089d02cf2bddf1bba6eaa2b2fcce149dc44633e.tar.gz frameworks_av-c089d02cf2bddf1bba6eaa2b2fcce149dc44633e.tar.bz2 | |
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')
| -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 b311f35..078be94 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 |