diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index 701ff088d..9be1a070c 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 89d973dda..a6c10518e 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/src/org/linphone/AboutActivity.java b/src/org/linphone/AboutActivity.java
index 3797305cd..0e54ed1fc 100644
--- a/src/org/linphone/AboutActivity.java
+++ b/src/org/linphone/AboutActivity.java
@@ -38,4 +38,5 @@ public class AboutActivity extends Activity {
 			Log.e(LinphoneService.TAG, "cannot get version name", e);
 		}
 	}
+	
 }
diff --git a/src/org/linphone/core/AndroidVideoWindowImpl.java b/src/org/linphone/core/AndroidVideoWindowImpl.java
index 2bb4314f5..87e1dc525 100644
--- a/src/org/linphone/core/AndroidVideoWindowImpl.java
+++ b/src/org/linphone/core/AndroidVideoWindowImpl.java
@@ -28,8 +28,9 @@ public class AndroidVideoWindowImpl  {
 					int width, int height) {
 				synchronized(AndroidVideoWindowImpl.this){
 					mBitmap=Bitmap.createBitmap(width,height,Config.RGB_565);
-					if (mListener!=null) mListener.onSurfaceReady(AndroidVideoWindowImpl.this);
 					mSurface=holder.getSurface();
+					if (mListener!=null) mListener.onSurfaceReady(AndroidVideoWindowImpl.this);
+					
 				}
 			}
 
@@ -38,10 +39,10 @@ public class AndroidVideoWindowImpl  {
 
 			public void surfaceDestroyed(SurfaceHolder holder) {
 				synchronized(AndroidVideoWindowImpl.this){
-					mBitmap=null;
 					if (mListener!=null)
 						mListener.onSurfaceDestroyed(AndroidVideoWindowImpl.this);
 					mSurface=null;
+					mBitmap=null;
 				}
 			}
 		});
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index 9822631e3..43771da28 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -87,6 +87,8 @@ LOCAL_SRC_FILES = \
 	libavcodec/pthread.c
 
 
+LOCAL_ARM_MODE := arm
+
 #LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm
 LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H 
 
diff --git a/submodules/externals/build/ffmpeg/Android_libavutil.mk b/submodules/externals/build/ffmpeg/Android_libavutil.mk
index deee06d08..08d65b5dd 100755
--- a/submodules/externals/build/ffmpeg/Android_libavutil.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavutil.mk
@@ -37,7 +37,7 @@ LOCAL_SRC_FILES = \
 
 LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 
-
+LOCAL_ARM_MODE := arm
 
 #for including config.h:
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  $(LOCAL_PATH)/
diff --git a/submodules/externals/build/ffmpeg/Android_libswscale.mk b/submodules/externals/build/ffmpeg/Android_libswscale.mk
index 96a7fe7af..6bd8cc828 100755
--- a/submodules/externals/build/ffmpeg/Android_libswscale.mk
+++ b/submodules/externals/build/ffmpeg/Android_libswscale.mk
@@ -13,10 +13,13 @@ LOCAL_SRC_FILES = \
 
 LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 
+LOCAL_ARM_MODE := arm
+
 #for including config.h:
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  \
 					$(LOCAL_PATH)/../ffmpeg \
 					$(LOCAL_PATH)/ \
 					$(LOCAL_PATH)/../
+
 include $(BUILD_STATIC_LIBRARY)