Skip to content

Commit 608c1ba

Browse files
Hans-Peter Jansenakallabeth
Hans-Peter Jansen
authored andcommitted
Remove unused codec x264
1 parent 64b03ff commit 608c1ba

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

Diff for: .travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ addons:
4141
- libgsm1-dev
4242
- libavcodec-dev
4343
- libavutil-dev
44-
- libx264-dev
4544
- libxext-dev
4645
- ninja-build
4746
- libsystemd-dev

Diff for: CMakeLists.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -650,10 +650,6 @@ set(JPEG_FEATURE_TYPE "OPTIONAL")
650650
set(JPEG_FEATURE_PURPOSE "codec")
651651
set(JPEG_FEATURE_DESCRIPTION "use JPEG library")
652652

653-
set(X264_FEATURE_TYPE "OPTIONAL")
654-
set(X264_FEATURE_PURPOSE "codec")
655-
set(X264_FEATURE_DESCRIPTION "use x264 library")
656-
657653
set(OPENH264_FEATURE_TYPE "OPTIONAL")
658654
set(OPENH264_FEATURE_PURPOSE "codec")
659655
set(OPENH264_FEATURE_DESCRIPTION "use OpenH264 library")
@@ -765,7 +761,6 @@ find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DE
765761
find_feature(FFmpeg ${FFMPEG_FEATURE_TYPE} ${FFMPEG_FEATURE_PURPOSE} ${FFMPEG_FEATURE_DESCRIPTION})
766762

767763
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})
769764
find_feature(OpenH264 ${OPENH264_FEATURE_TYPE} ${OPENH264_FEATURE_PURPOSE} ${OPENH264_FEATURE_DESCRIPTION})
770765
find_feature(OpenCL ${OPENCL_FEATURE_TYPE} ${OPENCL_FEATURE_PURPOSE} ${OPENCL_FEATURE_DESCRIPTION})
771766
find_feature(GSM ${GSM_FEATURE_TYPE} ${GSM_FEATURE_PURPOSE} ${GSM_FEATURE_DESCRIPTION})
@@ -851,7 +846,7 @@ if(MBEDTLS_FOUND)
851846
add_definitions("-DWITH_MBEDTLS")
852847
endif()
853848

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)
855850
set(WITH_GFX_H264 ON)
856851
else()
857852
set(WITH_GFX_H264 OFF)

Diff for: config.h.in

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#cmakedefine WITH_FFMPEG
5252
#cmakedefine WITH_DSP_EXPERIMENTAL
5353
#cmakedefine WITH_DSP_FFMPEG
54-
#cmakedefine WITH_X264
5554
#cmakedefine WITH_OPENCL
5655
#cmakedefine WITH_MEDIA_FOUNDATION
5756

0 commit comments

Comments
 (0)