Commit 55b66fc9 authored by Sandrine Avakian's avatar Sandrine Avakian

Merge branch 'master' of git.linphone.org:mediastreamer2 into dev_codecbv16

parents 2b2516c2 443ca68a
......@@ -472,7 +472,7 @@ add_dependencies(mediastreamer_voip-objects ms2-git-version ms2-voipdescs-header
if(APPLE OR GLX_FOUND)
add_dependencies(mediastreamer_voip-objects ms2-yuv2rgb-fs-header ms2-yuv2rgb-vs-header)
endif()
if(FFMPEG_FOUND)
if(FFMPEG_FOUND AND NOT WIN32)
set_source_files_properties(
videofilters/jpegwriter.c
videofilters/videoenc.c
......
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