mirror of https://github.com/FreeRDP/FreeRDP
Remove unused codec x264
This commit is contained in:
parent
64b03fff19
commit
608c1baca0
|
@ -41,7 +41,6 @@ addons:
|
||||||
- libgsm1-dev
|
- libgsm1-dev
|
||||||
- libavcodec-dev
|
- libavcodec-dev
|
||||||
- libavutil-dev
|
- libavutil-dev
|
||||||
- libx264-dev
|
|
||||||
- libxext-dev
|
- libxext-dev
|
||||||
- ninja-build
|
- ninja-build
|
||||||
- libsystemd-dev
|
- libsystemd-dev
|
||||||
|
|
|
@ -650,10 +650,6 @@ set(JPEG_FEATURE_TYPE "OPTIONAL")
|
||||||
set(JPEG_FEATURE_PURPOSE "codec")
|
set(JPEG_FEATURE_PURPOSE "codec")
|
||||||
set(JPEG_FEATURE_DESCRIPTION "use JPEG library")
|
set(JPEG_FEATURE_DESCRIPTION "use JPEG library")
|
||||||
|
|
||||||
set(X264_FEATURE_TYPE "OPTIONAL")
|
|
||||||
set(X264_FEATURE_PURPOSE "codec")
|
|
||||||
set(X264_FEATURE_DESCRIPTION "use x264 library")
|
|
||||||
|
|
||||||
set(OPENH264_FEATURE_TYPE "OPTIONAL")
|
set(OPENH264_FEATURE_TYPE "OPTIONAL")
|
||||||
set(OPENH264_FEATURE_PURPOSE "codec")
|
set(OPENH264_FEATURE_PURPOSE "codec")
|
||||||
set(OPENH264_FEATURE_DESCRIPTION "use OpenH264 library")
|
set(OPENH264_FEATURE_DESCRIPTION "use OpenH264 library")
|
||||||
|
@ -765,7 +761,6 @@ find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DE
|
||||||
find_feature(FFmpeg ${FFMPEG_FEATURE_TYPE} ${FFMPEG_FEATURE_PURPOSE} ${FFMPEG_FEATURE_DESCRIPTION})
|
find_feature(FFmpeg ${FFMPEG_FEATURE_TYPE} ${FFMPEG_FEATURE_PURPOSE} ${FFMPEG_FEATURE_DESCRIPTION})
|
||||||
|
|
||||||
find_feature(JPEG ${JPEG_FEATURE_TYPE} ${JPEG_FEATURE_PURPOSE} ${JPEG_FEATURE_DESCRIPTION})
|
find_feature(JPEG ${JPEG_FEATURE_TYPE} ${JPEG_FEATURE_PURPOSE} ${JPEG_FEATURE_DESCRIPTION})
|
||||||
find_feature(x264 ${X264_FEATURE_TYPE} ${X264_FEATURE_PURPOSE} ${X264_FEATURE_DESCRIPTION})
|
|
||||||
find_feature(OpenH264 ${OPENH264_FEATURE_TYPE} ${OPENH264_FEATURE_PURPOSE} ${OPENH264_FEATURE_DESCRIPTION})
|
find_feature(OpenH264 ${OPENH264_FEATURE_TYPE} ${OPENH264_FEATURE_PURPOSE} ${OPENH264_FEATURE_DESCRIPTION})
|
||||||
find_feature(OpenCL ${OPENCL_FEATURE_TYPE} ${OPENCL_FEATURE_PURPOSE} ${OPENCL_FEATURE_DESCRIPTION})
|
find_feature(OpenCL ${OPENCL_FEATURE_TYPE} ${OPENCL_FEATURE_PURPOSE} ${OPENCL_FEATURE_DESCRIPTION})
|
||||||
find_feature(GSM ${GSM_FEATURE_TYPE} ${GSM_FEATURE_PURPOSE} ${GSM_FEATURE_DESCRIPTION})
|
find_feature(GSM ${GSM_FEATURE_TYPE} ${GSM_FEATURE_PURPOSE} ${GSM_FEATURE_DESCRIPTION})
|
||||||
|
@ -851,7 +846,7 @@ if(MBEDTLS_FOUND)
|
||||||
add_definitions("-DWITH_MBEDTLS")
|
add_definitions("-DWITH_MBEDTLS")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WITH_X264 OR WITH_OPENH264 OR WITH_MEDIA_FOUNDATION OR WITH_FFMPEG)
|
if (WITH_OPENH264 OR WITH_MEDIA_FOUNDATION OR WITH_FFMPEG)
|
||||||
set(WITH_GFX_H264 ON)
|
set(WITH_GFX_H264 ON)
|
||||||
else()
|
else()
|
||||||
set(WITH_GFX_H264 OFF)
|
set(WITH_GFX_H264 OFF)
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
#cmakedefine WITH_FFMPEG
|
#cmakedefine WITH_FFMPEG
|
||||||
#cmakedefine WITH_DSP_EXPERIMENTAL
|
#cmakedefine WITH_DSP_EXPERIMENTAL
|
||||||
#cmakedefine WITH_DSP_FFMPEG
|
#cmakedefine WITH_DSP_FFMPEG
|
||||||
#cmakedefine WITH_X264
|
|
||||||
#cmakedefine WITH_OPENCL
|
#cmakedefine WITH_OPENCL
|
||||||
#cmakedefine WITH_MEDIA_FOUNDATION
|
#cmakedefine WITH_MEDIA_FOUNDATION
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue