diff options
| author | Ted Hess <thess@kitschensync.net> | 2018-02-10 07:52:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 07:52:17 -0500 |
| commit | 3f1814e6b6b9d22547b85337492291d6e23c95b5 (patch) | |
| tree | e738bc4261ed8a80ebac36781e0438a0ff03c091 /multimedia | |
| parent | 11f435adc667b97467fc04d5a3fb72523847eb82 (diff) | |
| parent | 89f068f53998eee0c8dd057a9bb9489d377b9138 (diff) | |
Merge pull request #5508 from neheb/patch-4
gst1-libav: Remove BUILD_PATENTED for AC3, MP[23]
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gst1-libav/Config.in | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/multimedia/gst1-libav/Config.in b/multimedia/gst1-libav/Config.in index b394d7ddc..65d824793 100644 --- a/multimedia/gst1-libav/Config.in +++ b/multimedia/gst1-libav/Config.in @@ -13,11 +13,11 @@ config GET_LIBAV_COMMON_AV_SUPPORT bool "Include support for common audio/video decoders" default y select GST1_LIBAV_DECODER_aac if GST1_LIBAV_PATENTED - select GST1_LIBAV_DECODER_ac3 if GST1_LIBAV_PATENTED + select GST1_LIBAV_DECODER_ac3 select GST1_LIBAV_DECODER_h264 if GST1_LIBAV_PATENTED select GST1_LIBAV_DECODER_atrac3 if GST1_LIBAV_PATENTED select GST1_LIBAV_DECODER_jpegls - select GST1_LIBAV_DECODER_mp3 if GST1_LIBAV_PATENTED + select GST1_LIBAV_DECODER_mp3 select GST1_LIBAV_DECODER_mpeg1video select GST1_LIBAV_DECODER_mpeg2video if GST1_LIBAV_PATENTED select GST1_LIBAV_DECODER_mpeg4 if GST1_LIBAV_PATENTED @@ -36,7 +36,7 @@ config GET_LIBAV_COMMON_AV_SUPPORT select GST1_LIBAV_PARSER_mpeg4video select GST1_LIBAV_DEMUXER_ac3 select GST1_LIBAV_DEMUXER_h264 if GST1_LIBAV_PATENTED - select GST1_LIBAV_DEMUXER_mp3 if GST1_LIBAV_PATENTED + select GST1_LIBAV_DEMUXER_mp3 select GST1_LIBAV_DEMUXER_mpegvideo if GST1_LIBAV_PATENTED select GST1_LIBAV_DEMUXER_ogg @@ -44,7 +44,6 @@ comment "Encoders ---" config GST1_LIBAV_ENCODER_ac3 bool "AC3" - depends on GST1_LIBAV_PATENTED select GST1_LIBAV_PARSER_ac3 config GST1_LIBAV_ENCODER_jpegls @@ -86,7 +85,6 @@ config GST1_LIBAV_DECODER_aac config GST1_LIBAV_DECODER_ac3 bool "AC3" - depends on GST1_LIBAV_PATENTED select GST1_LIBAV_PARSER_ac3 config GST1_LIBAV_DECODER_atrac3 @@ -105,11 +103,9 @@ config GST1_LIBAV_DECODER_jpegls config GST1_LIBAV_DECODER_mp2 bool "MP2 (MPEG Audio Layer 2)" - depends on GST1_LIBAV_PATENTED config GST1_LIBAV_DECODER_mp3 bool "MP3 (MPEG Audio Layer 2)" - depends on GST1_LIBAV_PATENTED config GST1_LIBAV_DECODER_mpegvideo bool "MPEG Video" @@ -157,7 +153,6 @@ comment "Muxers ---" config GST1_LIBAV_MUXER_ac3 bool "AC3" - depends on GST1_LIBAV_PATENTED config GST1_LIBAV_MUXER_ffm bool "FFM (ffserver live feed)" |