Merge branch 'master' of https://github.com/mpromonet/v4l2rtspserver

.gitignore

@@ -5,9 +5,7 @@ CMakeCache.txt
 Makefile
 # build
 libv4l2wrapper.a
-h264_v4l2_rtspserver
 v4l2rtspserver
-rootfs
 # cpack
 _CPack_Packages
 install_manifest.txt

CMakeLists.txt

@@ -74,7 +74,7 @@ find_path(LIBLIVE555_INCLUDE_DIR liveMedia/liveMedia.hh)
 if (NOT LIBLIVE555_INCLUDE_DIR)
         message(STATUS "Installing live555")
         EXEC_PROGRAM("wget http://www.live555.com/liveMedia/public/live555-latest.tar.gz -O - | tar xzf -")
-        EXEC_PROGRAM("cd live && ./genMakefiles linux-gdb && make CPLUSPLUS_COMPILER=${CMAKE_CXX_COMPILER} C_COMPILER=${CMAKE_C_COMPILER} LINK='${CMAKE_CXX_COMPILER} -o' PREFIX=${CMAKE_FIND_ROOT_PATH} install")
+        EXEC_PROGRAM("cd live && ./genMakefiles linux-gdb && make CPLUSPLUS_COMPILER=${CMAKE_CXX_COMPILER} C_COMPILER=${CMAKE_C_COMPILER} LINK='${CMAKE_CXX_COMPILER} -o' CPPFLAGS=-DALLOW_RTSP_SERVER_PORT_REUSE=1 PREFIX=${CMAKE_FIND_ROOT_PATH} install")
 else (NOT LIBLIVE555_INCLUDE_DIR)
 	SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}liblivemedia-dev,)
 endif (NOT LIBLIVE555_INCLUDE_DIR)

src/main.cpp

@@ -490,10 +490,12 @@ int main(int argc, char** argv)
 				std::cout << "\t -H height : V4L2 capture height (default "<< height << ")"                                                    << std::endl;
 				std::cout << "\t -F fps    : V4L2 capture framerate (default "<< fps << ")"                                                    << std::endl;
 				
+#ifdef HAVE_ALSA	
 				std::cout << "\t ALSA options :"                                                                                               << std::endl;
 				std::cout << "\t -A freq    : ALSA capture frequency and channel (default " << audioFreq << ")"                                << std::endl;
 				std::cout << "\t -C channels: ALSA capture channels (default " << audioNbChannels << ")"                                       << std::endl;
 				std::cout << "\t -a fmt     : ALSA capture audio format (default S16_BE)"                                                      << std::endl;
+#endif
 				
 				std::cout << "\t Devices :"                                                                                                    << std::endl;
 				std::cout << "\t [V4L2 device][,ALSA device] : V4L2 capture device or/and ALSA capture device (default "<< dev_name << ")"     << std::endl;