1From 342f59f1603f759b6dd90754f8dba14d08947f55 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Thu, 27 Feb 2020 16:18:35 +0100
4Subject: [PATCH] src/videofilters/nowebcam.c: fix build without ffmpeg or jpeg
5
6jpeg2yuv is only defined if ffmpeg or turbojpeg is available
7
8Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
9---
10 CMakeLists.txt              | 3 +++
11 src/videofilters/nowebcam.c | 4 ++++
12 2 files changed, 7 insertions(+)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 0efc1a5f..6668db2b 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -336,7 +336,10 @@ if(ENABLE_JPEG)
19 	if(NOT TURBOJPEG_FOUND)
20 		message(WARNING "Could not find libturbo-jpeg, mediastreamer2 will be compiled without LibJpeg-Turbo")
21 		set(ENABLE_JPEG OFF CACHE BOOL "Enable JPEG support" FORCE)
22+		add_definitions(-DNO_JPEG)
23 	endif()
24+else()
25+	add_definitions(-DNO_JPEG)
26 endif()
27 if(ENABLE_QRCODE)
28 	find_package(Zxing)
29diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
30index a2344dcd..afb0d7b1 100644
31--- a/src/videofilters/nowebcam.c
32+++ b/src/videofilters/nowebcam.c
33@@ -107,7 +107,9 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize) {
34 	if (err != st_sizel) {
35 		  ms_error("Could not read as much as wanted !");
36 	}
37+#if !(defined(NO_FFMPEG) && defined(NO_JPEG))
38 	m = jpeg2yuv(jpgbuf, st_sizel, reqsize);
39+#endif
40 	ms_free(jpgbuf);
41 	if (m == NULL) {
42 		CloseHandle(fd);
43@@ -140,7 +142,9 @@ static mblk_t *_ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize) {
44 		if (err != statbuf.st_size) {
45 			ms_error("Could not read as much as wanted: %i<>%li !", err, (long)statbuf.st_size);
46 		}
47+#if !(defined(NO_FFMPEG) && defined(NO_JPEG))
48 		m = jpeg2yuv(jpgbuf,statbuf.st_size,reqsize);
49+#endif
50 		ms_free(jpgbuf);
51 		if (m == NULL) {
52 			close(fd);
53--
542.25.0
55
56