diff options
author | Wei Jia <wjia@google.com> | 2014-11-15 03:09:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-15 03:09:28 +0000 |
commit | 060ef2a4f42820c77ded1de99c6e1f5edb0033a0 (patch) | |
tree | 00f0362e2a7f9da2d709e9052c9b5384a3f78ff8 /media/libstagefright/mpeg2ts | |
parent | 0344dcb26841dd8d0f1e0169afa24cc7516ca69c (diff) | |
parent | 1ea52d5ff0465f9353fcf14ed64246c1b9bf4439 (diff) | |
download | frameworks_av-060ef2a4f42820c77ded1de99c6e1f5edb0033a0.zip frameworks_av-060ef2a4f42820c77ded1de99c6e1f5edb0033a0.tar.gz frameworks_av-060ef2a4f42820c77ded1de99c6e1f5edb0033a0.tar.bz2 |
am 1ea52d5f: am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into lmp-mr1-dev automerge: b915eeb
* commit '1ea52d5ff0465f9353fcf14ed64246c1b9bf4439':
NuPlayer: tunnel decoder with renderer for data buffer passing.
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index c1dc0f9..482ccff 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -679,7 +679,7 @@ void ATSParser::Stream::signalDiscontinuity( int64_t resumeAtMediaTimeUs = mProgram->convertPTSToTimestamp(resumeAtPTS); - extra->setInt64("resume-at-mediatimeUs", resumeAtMediaTimeUs); + extra->setInt64("resume-at-mediaTimeUs", resumeAtMediaTimeUs); } } |