summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-04 14:47:18 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-04 14:47:18 -0800
commitc213b812514d16dd401cd308b9203b70bfbb3d5f (patch)
treeede1233a9f703e7a207b70ab694ebf0ae69a51e6 /include
parentc2f95fba3ab2a4e512fd1152a12e64691f2ea73d (diff)
parent1aef211b4e5dc952081727bfd2318b2cb5ca4506 (diff)
downloadframeworks_av-c213b812514d16dd401cd308b9203b70bfbb3d5f.zip
frameworks_av-c213b812514d16dd401cd308b9203b70bfbb3d5f.tar.gz
frameworks_av-c213b812514d16dd401cd308b9203b70bfbb3d5f.tar.bz2
Merge "Properly shutdown the decoders on a reset() in NuPlayer's implementation."
Diffstat (limited to 'include')
-rw-r--r--include/media/mediaplayer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index 88b0c3e..178f0db 100644
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -36,6 +36,7 @@ enum media_event_type {
MEDIA_BUFFERING_UPDATE = 3,
MEDIA_SEEK_COMPLETE = 4,
MEDIA_SET_VIDEO_SIZE = 5,
+ MEDIA_RESET_COMPLETE = 6, // not visible on java side
MEDIA_ERROR = 100,
MEDIA_INFO = 200,
};