diff --git a/build/android/Android.mk b/build/android/Android.mk
index 9ffa43192..c0e8df8a2 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -57,7 +57,10 @@ LOCAL_CFLAGS += \
 	-DLOG_DOMAIN=\"Linphone\"
 
 LOCAL_CFLAGS += -DIN_LINPHONE
-#LOCAL_CFLAGS += -DVIDEO_ENABLED -DIN_LINPHONE
+
+ifeq ($(LINPHONE_VIDEO),1)
+LOCAL_CFLAGS += -DVIDEO_ENABLED
+endif
 
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH) \
@@ -76,6 +79,15 @@ LOCAL_STATIC_LIBRARIES := \
 	libeXosip2 \
 	libosip2 \
 	libgsm
+
+ifeq ($(LINPHONE_VIDEO),1)
+LOCAL_STATIC_LIBRARIES += \
+	libavcodec \
+	libswscale \
+	libavcore \
+	libavutil
+endif
+
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
    LOCAL_CFLAGS += -DHAVE_ILBC=1
    LOCAL_STATIC_LIBRARIES += libmsilbc
diff --git a/mediastreamer2 b/mediastreamer2
index 6701e0744..20da8f413 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6701e074484fd6725b789b2854a2be5bd2784ef5
+Subproject commit 20da8f413994f0959ab81b391894defa70eaa1f6