From c42a96dba4beaf87875e71b8d8b77ce7154c5cdb Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Fri, 25 Jul 2014 11:08:50 -0700 Subject: MediaPlayer: scanInternalSubtitleTracks in synchronous prepare Bug: 16385674 Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad --- media/jni/android_media_MediaPlayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/jni/android_media_MediaPlayer.cpp') diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 4587cf5..73a924d 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -861,7 +861,7 @@ static JNINativeMethod gMethods[] = { {"_setDataSource", "(Ljava/io/FileDescriptor;JJ)V", (void *)android_media_MediaPlayer_setDataSourceFD}, {"_setVideoSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaPlayer_setVideoSurface}, - {"prepare", "()V", (void *)android_media_MediaPlayer_prepare}, + {"_prepare", "()V", (void *)android_media_MediaPlayer_prepare}, {"prepareAsync", "()V", (void *)android_media_MediaPlayer_prepareAsync}, {"_start", "()V", (void *)android_media_MediaPlayer_start}, {"_stop", "()V", (void *)android_media_MediaPlayer_stop}, -- cgit v1.1