From 6ea0b85e49a4f785066bf88a98860dda574efc31 Mon Sep 17 00:00:00 2001
From: Zhang Rui <bbcallen@gmail.com>
Date: Tue, 22 Dec 2015 16:14:06 +0800
Subject: [PATCH] android/player: it's OK to set NULL surface before shutdown
 player

---
 ijkmedia/ijkplayer/android/ijkplayer_jni.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ijkmedia/ijkplayer/android/ijkplayer_jni.c b/ijkmedia/ijkplayer/android/ijkplayer_jni.c
index 6f3d0ee9..6834faa8 100644
--- a/ijkmedia/ijkplayer/android/ijkplayer_jni.c
+++ b/ijkmedia/ijkplayer/android/ijkplayer_jni.c
@@ -322,9 +322,9 @@ IjkMediaPlayer_release(JNIEnv *env, jobject thiz)
     if (!mp)
         return;
 
+    ijkmp_android_set_surface(env, mp, NULL);
     // explicit shutdown mp, in case it is not the last mp-ref here
     ijkmp_shutdown(mp);
-    ijkmp_android_set_surface(env, mp, NULL);
     //only delete weak_thiz at release
     jobject weak_thiz = (jobject) ijkmp_set_weak_thiz(mp, NULL );
     (*env)->DeleteGlobalRef(env, weak_thiz);
-- 
GitLab