v4l2rtspserver: simplify build using release 0.1.6

Signed-off-by: Michel Promonet <michel.promonet@free.fr>

multimedia/v4l2rtspserver/files/config.openwrt

@@ -1,19 +0,0 @@
-COMPILE_OPTS =			$(INCLUDES) -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLOCALE_NOT_USED -DNO_SSTREAM=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 
-C =				c
-C_COMPILER =			$(GCC)
-CFLAGS +=			$(COMPILE_OPTS)
-C_FLAGS =			$(CFLAGS)
-CPP =				cpp
-CPLUSPLUS_COMPILER =		$(AS) # optimizations are only in AR apparently, so use instead of CXX
-CPLUSPLUS_FLAGS =		$(COMPILE_OPTS) -Wall -DBSD=1
-CPLUSPLUS_FLAGS +=		$(CPPFLAGS) -fexceptions
-OBJ =				o
-LINK =				$(CXX) -o
-LINK_OPTS =			-L. $(LDFLAGS)
-CONSOLE_LINK_OPTS =		$(LINK_OPTS)
-LIBRARY_LINK =			$(AR) cr 
-LIBRARY_LINK_OPTS =    
-LIB_SUFFIX =			a
-LIBS_FOR_CONSOLE_APPLICATION =	$(CXXLIBS)
-LIBS_FOR_GUI_APPLICATION =	$(LIBS_FOR_CONSOLE_APPLICATION)
-EXE =

multimedia/v4l2rtspserver/files/v4l2rtspserver.init

@@ -40,10 +40,6 @@ start_instance() {
 	config_get path "$s" 'path'
 	config_get format "$s" 'format'
 
-	# pull out resolution width and height from string
-	local w="$(echo $resolution | cut -d'x' -f1)"
-	local h="$(echo $resolution | cut -d'x' -f2)"
-	
 	# make sure format is uppercase
 	format="$(echo $format | tr a-z A-Z)"
 
@@ -52,9 +48,10 @@ start_instance() {
 	args="$args -P $port"
 	args="$args -u ${path}"
 	args="$args -F $fps"
-	args="$args -W $w"
-	args="$args -H $h"
-	args="$args -f$format"
+	args="$args -G ${resolution}"
+        if [ ! -z "$format" ]; then
+                args="$args -f$format"
+        fi
 	args="$args -c" # fixes issue with corrupt frames with H264
 		
 	if [ -n "$username" ]; then