Merge pull request #5618 from neheb/ffm
ffmpeg: Remove BUILD_PATENTED for MPEG2 video.
This commit is contained in:
commit
6dc4c55953
1 changed files with 0 additions and 2 deletions
|
@ -170,7 +170,6 @@ config FFMPEG_CUSTOM_ENCODER_mpeg1video
|
||||||
|
|
||||||
config FFMPEG_CUSTOM_ENCODER_mpeg2video
|
config FFMPEG_CUSTOM_ENCODER_mpeg2video
|
||||||
bool "MPEG-2 Video"
|
bool "MPEG-2 Video"
|
||||||
depends on FFMPEG_CUSTOM_PATENTED
|
|
||||||
|
|
||||||
config FFMPEG_CUSTOM_ENCODER_mpeg4
|
config FFMPEG_CUSTOM_ENCODER_mpeg4
|
||||||
bool "MPEG-4"
|
bool "MPEG-4"
|
||||||
|
@ -253,7 +252,6 @@ config FFMPEG_CUSTOM_DECODER_mpeg1video
|
||||||
|
|
||||||
config FFMPEG_CUSTOM_DECODER_mpeg2video
|
config FFMPEG_CUSTOM_DECODER_mpeg2video
|
||||||
bool "MPEG-2 Video"
|
bool "MPEG-2 Video"
|
||||||
depends on FFMPEG_CUSTOM_PATENTED
|
|
||||||
|
|
||||||
config FFMPEG_CUSTOM_DECODER_mpeg4
|
config FFMPEG_CUSTOM_DECODER_mpeg4
|
||||||
bool "MPEG-4"
|
bool "MPEG-4"
|
||||||
|
|
Loading…
Reference in a new issue