summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-02-08 13:15:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-08 13:15:37 -0800
commit5ed9a80571ede30d4cb7967227bff996c9cecb9e (patch)
treef691e3a4ecf7053c14af2eba66e9ad375b955877 /include/media
parent357a9335c24ed0844187d9f8aace53acbca48c50 (diff)
parentb9289833341ec19e016891d0ca9638f0973b9647 (diff)
downloadframeworks_base-5ed9a80571ede30d4cb7967227bff996c9cecb9e.zip
frameworks_base-5ed9a80571ede30d4cb7967227bff996c9cecb9e.tar.gz
frameworks_base-5ed9a80571ede30d4cb7967227bff996c9cecb9e.tar.bz2
Merge "Handle some edge cases when seeking while starting up OMXCodec"
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/OMXCodec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 82948cb..f7d837a 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -175,6 +175,7 @@ private:
int64_t mSeekTimeUs;
ReadOptions::SeekMode mSeekMode;
int64_t mTargetTimeUs;
+ bool mOutputPortSettingsChangedPending;
MediaBuffer *mLeftOverBuffer;