diff --git a/jni/Application.mk b/jni/Application.mk
index a22237072..ad5a65625 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone msandroiddisplay
+APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone
 
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index 0af120b85..701ff088d 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi-v7a/libmsandroiddisplay.so b/libs/armeabi-v7a/libmsandroiddisplay.so
deleted file mode 100755
index 2fb162954..000000000
Binary files a/libs/armeabi-v7a/libmsandroiddisplay.so and /dev/null differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 78a83cfe4..89d973dda 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/libs/armeabi/libmsandroiddisplay.so b/libs/armeabi/libmsandroiddisplay.so
deleted file mode 100755
index d9dbdcf93..000000000
Binary files a/libs/armeabi/libmsandroiddisplay.so and /dev/null differ
diff --git a/src/org/linphone/BootReceiver.java b/src/org/linphone/BootReceiver.java
index 097767fab..836e62d12 100644
--- a/src/org/linphone/BootReceiver.java
+++ b/src/org/linphone/BootReceiver.java
@@ -34,5 +34,4 @@ public class BootReceiver extends BroadcastReceiver {
 			context.startService(lLinphoneServiceIntent);;
 		}
 	}
-	
 }
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index a9c817982..9822631e3 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -65,6 +65,8 @@ LOCAL_SRC_FILES = \
 	libavcodec/jfdctfst.c \
 	libavcodec/jfdctint.c \
 	libavcodec/jrevdct.c \
+	libavcodec/mjpeg.c.arm \
+	libavcodec/mjpegdec.c.arm \
 	libavcodec/motion_est.c.arm \
 	libavcodec/mpeg12data.c \
 	libavcodec/mpeg4video.c.arm \
diff --git a/submodules/externals/build/ffmpeg/README b/submodules/externals/build/ffmpeg/README
index 67f0198f5..77d16a1e2 100644
--- a/submodules/externals/build/ffmpeg/README
+++ b/submodules/externals/build/ffmpeg/README
@@ -1,3 +1,3 @@
 config.h and list of sources files generated by the following configure invocation:
 
-./configure --disable-mmx --prefix=/Users/jehanmonnier/opt --enable-cross-compile --arch=arm --target-os=linux --cc=arm-none-linux-gnueabi-gcc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --enable-pic --extra-cflags='-fPIC -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon
+./configure --disable-mmx --prefix=/Users/jehanmonnier/opt --enable-cross-compile --arch=arm --target-os=linux --cc=arm-none-linux-gnueabi-gcc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --enable-decoder=mjpeg --disable-avformat --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --enable-pic --extra-cflags='-fPIC -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon'
diff --git a/submodules/externals/build/ffmpeg/config.h b/submodules/externals/build/ffmpeg/config.h
index bfd1ec95c..0ea96b84c 100644
--- a/submodules/externals/build/ffmpeg/config.h
+++ b/submodules/externals/build/ffmpeg/config.h
@@ -287,7 +287,7 @@
 #define CONFIG_LOCO_DECODER 0
 #define CONFIG_MDEC_DECODER 0
 #define CONFIG_MIMIC_DECODER 0
-#define CONFIG_MJPEG_DECODER 0
+#define CONFIG_MJPEG_DECODER 1
 #define CONFIG_MJPEGB_DECODER 0
 #define CONFIG_MMVIDEO_DECODER 0
 #define CONFIG_MOTIONPIXELS_DECODER 0
diff --git a/submodules/linphone b/submodules/linphone
index 57a2bde8a..4bb9fbefa 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 57a2bde8a22d52a8aa8d3bffeb18c8ebe88a4b5c
+Subproject commit 4bb9fbefa30be99fdd6f6758ba169b482fe7184f