summaryrefslogtreecommitdiffstats
path: root/include
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
commiteeffad65d2db4879593c1d4806824ef5b4dcb3e1 (patch)
treeac530db863d4030d084c0a383317dce8fe879d64 /include
parentcd334d7a8e9df05f6b94eefbad2bddda0850f2cf (diff)
parent9c0096378820e5a61db26e52a7e6df50ba9c872d (diff)
downloadframeworks_av-eeffad65d2db4879593c1d4806824ef5b4dcb3e1.zip
frameworks_av-eeffad65d2db4879593c1d4806824ef5b4dcb3e1.tar.gz
frameworks_av-eeffad65d2db4879593c1d4806824ef5b4dcb3e1.tar.bz2
Merge "Handle some edge cases when seeking while starting up OMXCodec"
Diffstat (limited to 'include')
-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;