File tree 3 files changed +1
-8
lines changed
3 files changed +1
-8
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,6 @@ addons:
41
41
- libgsm1-dev
42
42
- libavcodec-dev
43
43
- libavutil-dev
44
- - libx264-dev
45
44
- libxext-dev
46
45
- ninja-build
47
46
- libsystemd-dev
Original file line number Diff line number Diff line change @@ -650,10 +650,6 @@ set(JPEG_FEATURE_TYPE "OPTIONAL")
650
650
set (JPEG_FEATURE_PURPOSE "codec" )
651
651
set (JPEG_FEATURE_DESCRIPTION "use JPEG library" )
652
652
653
- set (X264_FEATURE_TYPE "OPTIONAL" )
654
- set (X264_FEATURE_PURPOSE "codec" )
655
- set (X264_FEATURE_DESCRIPTION "use x264 library" )
656
-
657
653
set (OPENH264_FEATURE_TYPE "OPTIONAL" )
658
654
set (OPENH264_FEATURE_PURPOSE "codec" )
659
655
set (OPENH264_FEATURE_DESCRIPTION "use OpenH264 library" )
@@ -765,7 +761,6 @@ find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DE
765
761
find_feature(FFmpeg ${FFMPEG_FEATURE_TYPE} ${FFMPEG_FEATURE_PURPOSE} ${FFMPEG_FEATURE_DESCRIPTION} )
766
762
767
763
find_feature(JPEG ${JPEG_FEATURE_TYPE} ${JPEG_FEATURE_PURPOSE} ${JPEG_FEATURE_DESCRIPTION} )
768
- find_feature(x264 ${X264_FEATURE_TYPE} ${X264_FEATURE_PURPOSE} ${X264_FEATURE_DESCRIPTION} )
769
764
find_feature(OpenH264 ${OPENH264_FEATURE_TYPE} ${OPENH264_FEATURE_PURPOSE} ${OPENH264_FEATURE_DESCRIPTION} )
770
765
find_feature(OpenCL ${OPENCL_FEATURE_TYPE} ${OPENCL_FEATURE_PURPOSE} ${OPENCL_FEATURE_DESCRIPTION} )
771
766
find_feature(GSM ${GSM_FEATURE_TYPE} ${GSM_FEATURE_PURPOSE} ${GSM_FEATURE_DESCRIPTION} )
@@ -851,7 +846,7 @@ if(MBEDTLS_FOUND)
851
846
add_definitions ("-DWITH_MBEDTLS" )
852
847
endif ()
853
848
854
- if (WITH_X264 OR WITH_OPENH264 OR WITH_MEDIA_FOUNDATION OR WITH_FFMPEG)
849
+ if (WITH_OPENH264 OR WITH_MEDIA_FOUNDATION OR WITH_FFMPEG)
855
850
set (WITH_GFX_H264 ON )
856
851
else ()
857
852
set (WITH_GFX_H264 OFF )
Original file line number Diff line number Diff line change 51
51
#cmakedefine WITH_FFMPEG
52
52
#cmakedefine WITH_DSP_EXPERIMENTAL
53
53
#cmakedefine WITH_DSP_FFMPEG
54
- #cmakedefine WITH_X264
55
54
#cmakedefine WITH_OPENCL
56
55
#cmakedefine WITH_MEDIA_FOUNDATION
57
56
You can’t perform that action at this time.
0 commit comments