Merge pull request #5507 from neheb/patch-3

ffmpeg: Remove BUILD_PATENTED for AC3
This commit is contained in:
Ted Hess 2018-02-10 07:51:54 -05:00 committed by GitHub
commit 11f435adc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -161,7 +161,6 @@ comment "Encoders"
config FFMPEG_CUSTOM_ENCODER_ac3 config FFMPEG_CUSTOM_ENCODER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_ENCODER_jpegls config FFMPEG_CUSTOM_ENCODER_jpegls
bool "JPEG-LS" bool "JPEG-LS"
@ -204,7 +203,6 @@ config FFMPEG_CUSTOM_SELECT_adpcm
config FFMPEG_CUSTOM_DECODER_ac3 config FFMPEG_CUSTOM_DECODER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_alac config FFMPEG_CUSTOM_DECODER_alac
bool "ALAC" bool "ALAC"
@ -308,7 +306,6 @@ comment "Muxers"
config FFMPEG_CUSTOM_MUXER_ac3 config FFMPEG_CUSTOM_MUXER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_MUXER_ffm config FFMPEG_CUSTOM_MUXER_ffm
bool "FFM (ffserver live feed)" bool "FFM (ffserver live feed)"