avformat/mpegtsenc: move is_dvb_subtitle/is_dvb_teletext initialization upwards

[ffmpeg] / libavcodec / mediacodec_surface.c

diff --git a/libavcodec/mediacodec_surface.c b/libavcodec/mediacodec_surface.c
index aada1ecebe04ad882bcb63f690fbb97f18527439..09a42295d2fc473550d0acba32ab0c052b4fd68d 100644 (file)
--- a/libavcodec/mediacodec_surface.c
+++ b/libavcodec/mediacodec_surface.c
@@ -25,23 +25,19 @@
 #include "ffjni.h"
 #include "mediacodec_surface.h"
 
-void *ff_mediacodec_surface_ref(void *surface, void *log_ctx)
+FFANativeWindow *ff_mediacodec_surface_ref(void *surface, void *log_ctx)
 {
     JNIEnv *env = NULL;
 
-    void *reference = NULL;
-
     env = ff_jni_get_env(log_ctx);
     if (!env) {
         return NULL;
     }
 
-    reference = (*env)->NewGlobalRef(env, surface);
-
-    return reference;
+    return (*env)->NewGlobalRef(env, surface);
 }
 
-int ff_mediacodec_surface_unref(void *surface, void *log_ctx)
+int ff_mediacodec_surface_unref(FFANativeWindow *window, void *log_ctx)
 {
     JNIEnv *env = NULL;
 
@@ -50,7 +46,7 @@ int ff_mediacodec_surface_unref(void *surface, void *log_ctx)
         return AVERROR_EXTERNAL;
     }
 
-    (*env)->DeleteGlobalRef(env, surface);
+    (*env)->DeleteGlobalRef(env, window);
 
     return 0;
 }