From: Ian Leonard <redacted>
Date: Wed, 29 Apr 2020 00:32:45 +0000 (-0700)
Subject: ffmpeg: drop call to disable PATENTED_ENCODERS
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=366b8c706ff23742b15baf944f87b11c65369415;p=openwrt-packages.git

ffmpeg: drop call to disable PATENTED_ENCODERS

Presently, this attempts to disable atrac3, h264, hevc and vc1. These
encoders don't exist or are done through other programs (eg libx264).
Handling of those other programs is done elsewhere.

Signed-off-by: Ian Leonard <redacted>
---

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 333a8ef8a..a5025d73a 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -203,8 +203,6 @@ FFMPEG_PATENTED_DECODERS:= \
 	hevc \
 	vc1 \
 
-FFMPEG_PATENTED_ENCODERS:=$(FFMPEG_PATENTED_DECODERS)
-
 FFMPEG_PATENTED_MUXERS:= \
 	h264 \
 	hevc \
@@ -461,7 +459,6 @@ ifeq ($(BUILD_VARIANT),full)
 		--enable-gnutls \
 		$(if $(CONFIG_BUILD_PATENTED),, \
 			$(call FFMPEG_DISABLE,decoder,$(FFMPEG_PATENTED_DECODERS)) \
-			$(call FFMPEG_DISABLE,encoder,$(FFMPEG_PATENTED_ENCODERS)) \
 			$(call FFMPEG_DISABLE,muxer,$(FFMPEG_PATENTED_MUXERS)) \
 			$(call FFMPEG_DISABLE,demuxer,$(FFMPEG_PATENTED_DEMUXERS)) \
 			$(call FFMPEG_DISABLE,parser,$(FFMPEG_PATENTED_PARSERS))) \