Merge pull request #5618 from neheb/ffm

ffmpeg: Remove BUILD_PATENTED for MPEG2 video.
This commit is contained in:
Ted Hess
2018-02-14 21:19:30 -05:00
committed by GitHub
-2
View File
@@ -170,7 +170,6 @@ config FFMPEG_CUSTOM_ENCODER_mpeg1video
config FFMPEG_CUSTOM_ENCODER_mpeg2video
bool "MPEG-2 Video"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_ENCODER_mpeg4
bool "MPEG-4"
@@ -253,7 +252,6 @@ config FFMPEG_CUSTOM_DECODER_mpeg1video
config FFMPEG_CUSTOM_DECODER_mpeg2video
bool "MPEG-2 Video"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_mpeg4
bool "MPEG-4"