From 0e36beff306c231cee770bb03e145d2debee6dd3 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 29 Aug 2012 11:21:38 +0200 Subject: [PATCH] Add jpeg encoder to no-neon ffmpeg --- src/org/linphone/compatibility/Compatibility.java | 2 -- submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java index f6a61efbe..3d884a56f 100644 --- a/src/org/linphone/compatibility/Compatibility.java +++ b/src/org/linphone/compatibility/Compatibility.java @@ -32,11 +32,9 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.graphics.Bitmap; -import android.media.AudioManager; import android.net.Uri; import android.preference.Preference; import android.view.Display; -import android.view.Window; /** * @author Sylvain Berfini */ diff --git a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk b/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk index 9e6687e1f..5c558ea3b 100755 --- a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk +++ b/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk @@ -70,6 +70,7 @@ LOCAL_SRC_FILES = \ libavcodec/jrevdct.c \ libavcodec/mjpeg.c.arm \ libavcodec/mjpegdec.c.arm \ + libavcodec/mjpegenc.c.arm \ libavcodec/motion_est.c.arm \ libavcodec/mpeg12data.c \ libavcodec/mpeg4video.c.arm \