From ae89238ff966ab220cc5cfba2c67ac25745366cb Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 29 Jun 2012 09:53:20 +0200 Subject: [PATCH] Added MJPEG encoder to ffmepg to be able to take snapshots --- submodules/externals/build/ffmpeg/Android_libavcodec.mk | 1 + submodules/externals/build/ffmpeg/config.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk index ef2de0ac0..dab39a7e8 100755 --- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk +++ b/submodules/externals/build/ffmpeg/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 \ diff --git a/submodules/externals/build/ffmpeg/config.h b/submodules/externals/build/ffmpeg/config.h index 7a9591f6a..86eb0bae3 100644 --- a/submodules/externals/build/ffmpeg/config.h +++ b/submodules/externals/build/ffmpeg/config.h @@ -515,7 +515,7 @@ #define CONFIG_HUFFYUV_ENCODER 0 #define CONFIG_JPEGLS_ENCODER 0 #define CONFIG_LJPEG_ENCODER 0 -#define CONFIG_MJPEG_ENCODER 0 +#define CONFIG_MJPEG_ENCODER 1 #define CONFIG_MPEG1VIDEO_ENCODER 0 #define CONFIG_MPEG2VIDEO_ENCODER 0 #define CONFIG_MPEG4_ENCODER 1