From 366b8c706ff23742b15baf944f87b11c65369415 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 28 Apr 2020 17:32:45 -0700 Subject: [PATCH] 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 --- multimedia/ffmpeg/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 333a8ef8a7..a5025d73a1 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))) \