Commit 5e653bfe authored by François Grisez's avatar François Grisez

Fixes compilation when using FFMpeg 3.0

parent 08bd7cda
......@@ -345,14 +345,6 @@ endif()
set(VOIP_SOURCE_FILES_ALL ${VOIP_SOURCE_FILES_C} ${VOIP_SOURCE_FILES_CXX} ${VOIP_SOURCE_FILES_OBJC})
if(FFMPEG_FOUND AND NOT WIN32)
set_source_files_properties(
videofilters/jpegwriter.c
videofilters/videoenc.c
PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations"
)
endif()
add_custom_target(ms2-voipdescs-header
COMMAND ${CMAKE_COMMAND} -DAWK_PROGRAM=${AWK_PROGRAM} -DAWK_SCRIPTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../"
-DINPUT_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}
......@@ -520,6 +512,14 @@ if(ENABLE_SHARED)
)
endif()
if(FFMPEG_FOUND AND NOT WIN32)
set_source_files_properties(
videofilters/jpegwriter.c
videofilters/videoenc.c
PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations"
)
endif()
if(ENABLE_VIDEO)
install(FILES voip/nowebcamCIF.jpg
DESTINATION ${PACKAGE_DATA_DIR}/images
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment