am b83e7ca1: Merge "Fix pause at end of movie." into jb-dev

* commit 'b83e7ca14ab7241c1bbfb50dd6d97edf160f2b74':
  Fix pause at end of movie.
This commit is contained in:
Fred Gylys-Colwell
2012-05-31 16:38:21 -07:00
committed by Android Git Automerger
4 changed files with 35 additions and 12 deletions

View File

@@ -44,6 +44,8 @@ public:
static int sLastError;
int64_t getTime() { return mKeyTime; }; // usec.
#ifdef REQUIRE_SECURE_BUFFERS
class DecryptContext {
public:
@@ -85,6 +87,7 @@ private:
MediaBufferGroup *mGroup;
int64_t mKeyTime;
unsigned long long mDts;
unsigned long long mPts;