diff --git a/gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.java b/gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.java
index 870a916..e23256f 100644
--- a/gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.java
+++ b/gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.java
@@ -57,6 +57,10 @@ public class GstLibrary implements SurfaceHolder.Callback {
         nativePause();
     }
 
+    public void releaseSurface() {
+        nativeSurfaceFinalize();
+    }
+
     public void release() {
         nativeFinalize();
     }
@@ -119,13 +123,12 @@ public class GstLibrary implements SurfaceHolder.Callback {
         nativeClassInit();
     }
 
-    public void surfaceChanged(SurfaceHolder holder, int format, int width,
-            int height) {
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
         Log.d("GStreamer", "Surface changed to format " + format + " width " + width + " height " + height);
-        nativeSurfaceInit (holder.getSurface());
     }
 
     public void surfaceCreated(SurfaceHolder holder) {
+        nativeSurfaceInit (holder.getSurface());
         Log.d("GStreamer", "Surface created: " + holder.getSurface());
     }