Remove ffmpegserver

Author: FreddieAkeroyd

configure/RELEASE

@@ -35,7 +35,7 @@ ZLIB=$(SUPPORT)/zlib/master
 
 AREA_DETECTOR=$(SUPPORT)/areaDetector/master
 ADNED=$(AREA_DETECTOR)/ADnED
-FFMPEGSERVER=$(AREA_DETECTOR)/ffmpegServer
+#FFMPEGSERVER=$(AREA_DETECTOR)/ffmpegServer
 
 # optional extra local definitions here
 -include $(TOP)/configure/RELEASE.private

isisdaeApp/src/Makefile

@@ -41,12 +41,15 @@ isisdae_SRCS += NoAlarmPV.cpp
 isisdae_LIBS += webget htmltidy asyn oncrpc utilities zlib pcrecpp pcre pugixml
 isisdae_LIBS += ADnEDSupport
 isisdae_LIBS += cas gdd
-isisdae_LIBS += ffmpegServer
-isisdae_LIBS += avdevice
-isisdae_LIBS += avformat
-isisdae_LIBS += avcodec
-isisdae_LIBS += avutil
-isisdae_LIBS += swscale
+
+## ffmpegserver
+#isisdae_LIBS += ffmpegServer
+#isisdae_LIBS += avdevice
+#isisdae_LIBS += avformat
+#isisdae_LIBS += avcodec
+#isisdae_LIBS += avutil
+#isisdae_LIBS += swscale
+
 isisdae_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 #ifneq ($(findstring debug,$(EPICS_HOST_ARCH)),)

isisdaeTestApp/src/build.mak

@@ -31,7 +31,7 @@ $(APPNAME)_DBD += isisdae.dbd
 $(APPNAME)_DBD += webget.dbd
 $(APPNAME)_DBD += FileList.dbd
 $(APPNAME)_DBD += ADnEDSupport.dbd
-$(APPNAME)_DBD += ffmpegServer.dbd
+#$(APPNAME)_DBD += ffmpegServer.dbd
 
 # Add all the support libraries needed by this IOC
 ## ISIS standard libraries ##
@@ -48,12 +48,15 @@ $(APPNAME)_LIBS += asubFunctions
 #$(APPNAME)_LIBS += xxx
 $(APPNAME)_LIBS += isisdae FileList asyn oncrpc zlib efsw libjson pcrecpp pcre pugixml
 $(APPNAME)_LIBS += cas gdd 
-$(APPNAME)_LIBS += ffmpegServer
-$(APPNAME)_LIBS += avdevice
-$(APPNAME)_LIBS += avformat
-$(APPNAME)_LIBS += avcodec
-$(APPNAME)_LIBS += avutil
-$(APPNAME)_LIBS += swscale
+
+## ffmpegserver
+#$(APPNAME)_LIBS += ffmpegServer
+#$(APPNAME)_LIBS += avdevice
+#$(APPNAME)_LIBS += avformat
+#$(APPNAME)_LIBS += avcodec
+#$(APPNAME)_LIBS += avutil
+#$(APPNAME)_LIBS += swscale
+
 $(APPNAME)_LIBS += ADnEDSupport
 $(APPNAME)_LIBS += ADnEDTransform