diff --git a/.gitignore b/.gitignore
index cb0f53a..cef5039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ build/
 squashfs-root/
 
 buildpi/
-rpi-ffmpeg/
 
 .gradle/
 .cxx/
diff --git a/buildroot/package/rpi-ffmpeg/Config.in b/buildroot/package/rpi-ffmpeg/Config.in
new file mode 100644
index 0000000..d62281b
--- /dev/null
+++ b/buildroot/package/rpi-ffmpeg/Config.in
@@ -0,0 +1,187 @@
+config BR2_PACKAGE_RPI_FFMPEG_ARCH_SUPPORTS
+	bool
+	default y
+	# No support for ARMv7-M in the ARM assembly logic
+	depends on !BR2_ARM_CPU_ARMV7M
+	# m68k coldfire causes a build failure, because the check for
+	# atomics (atomic_store) succeeds, which causes ffmpeg to
+	# think atomic intrinsics are available, while they are
+	# not. See https://patchwork.ozlabs.org/patch/756664/ and
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more
+	# details.
+	depends on !BR2_m68k_cf
+	# assertion fail in binutils
+	depends on !(BR2_or1k && !BR2_TOOLCHAIN_GCC_AT_LEAST_9)
+
+menuconfig BR2_PACKAGE_RPI_FFMPEG
+	bool "rpi-ffmpeg"
+	depends on BR2_PACKAGE_RPI_FFMPEG_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  FFmpeg is a complete, cross-platform solution to record,
+	  convert and stream audio and video.
+
+	  With patches to facilitate hardware decoding on Raspberry Pi.
+
+	  https://www.ffmpeg.org
+
+if BR2_PACKAGE_RPI_FFMPEG
+
+config BR2_PACKAGE_RPI_FFMPEG_GPL
+	bool "Enable GPL code"
+	help
+	  allow use of GPL code, the resulting libs and binaries will
+	  be under GPL
+
+config BR2_PACKAGE_RPI_FFMPEG_NONFREE
+	bool "Enable nonfree code"
+	help
+	  allow use of nonfree code, the resulting libs and binaries
+	  will be unredistributable
+
+config BR2_PACKAGE_RPI_FFMPEG_FFMPEG
+	bool "Build ffmpeg (the command line application)"
+	default y
+	help
+	  FFmpeg is a very fast video and audio converter.
+	  It can also grab from a live audio/video source.
+
+	  It is not needed if you want to link the FFmpeg libraries
+	  to your application.
+
+config BR2_PACKAGE_RPI_FFMPEG_FFPLAY
+	bool "Build ffplay"
+	depends on !BR2_STATIC_LIBS # sdl2
+	select BR2_PACKAGE_RPI_FFMPEG_SWSCALE
+	select BR2_PACKAGE_SDL2
+	help
+	  FFplay is a very simple and portable media player using the
+	  FFmpeg libraries and the SDL library.
+	  It is mostly used as a testbed for the various FFmpeg APIs.
+
+comment "ffplay needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
+config BR2_PACKAGE_RPI_FFMPEG_FFPROBE
+	bool "Build ffprobe"
+	help
+	  FFprobe is a utility to determine the audio and video
+	  characteristics of a container file.
+
+config BR2_PACKAGE_RPI_FFMPEG_XCBGRAB
+	bool "Build X11 screen grabbing"
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBXCB
+	help
+	  X11 screen grabbing using libxcb.
+
+config BR2_PACKAGE_RPI_FFMPEG_POSTPROC
+	bool "Build libpostproc"
+	depends on BR2_PACKAGE_RPI_FFMPEG_GPL
+	help
+	  Postproc is a library of video postprocessing routines.
+
+config BR2_PACKAGE_RPI_FFMPEG_SWSCALE
+	bool "Build libswscale"
+	help
+	  Swscale is a library of video scaling routines.
+
+config BR2_PACKAGE_RPI_FFMPEG_ENCODERS
+	string "Enabled encoders"
+	default "all"
+	help
+	  Space-separated list of encoders to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-encoders in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_DECODERS
+	string "Enabled decoders"
+	default "all"
+	help
+	  Space-separated list of decoders to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-decoders in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_MUXERS
+	string "Enabled muxers"
+	default "all"
+	help
+	  Space-separated list of muxers to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-muxers in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_DEMUXERS
+	string "Enabled demuxers"
+	default "all"
+	help
+	  Space-separated list of demuxers to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-demuxers in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_PARSERS
+	string "Enabled parsers"
+	default "all"
+	help
+	  Space-separated list of parsers to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-parsers in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_BSFS
+	string "Enabled bitstreams"
+	default "all"
+	help
+	  Space-separated list of bitstream filters to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-bsfs in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_PROTOCOLS
+	string "Enabled protocols"
+	default "all"
+	help
+	  Space-separated list of protocols to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-protocols in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_FILTERS
+	string "Enabled filters"
+	default "all"
+	help
+	  Space-separated list of filters to build in FFmpeg,
+	  or "all" to build all of them.
+
+	  Run ./configure --list-filters in the ffmpeg sources
+	  directory to know the available options.
+
+config BR2_PACKAGE_RPI_FFMPEG_INDEVS
+	bool "Enable input devices"
+	default y
+
+config BR2_PACKAGE_RPI_FFMPEG_OUTDEVS
+	bool "Enable output devices"
+	default y
+
+config BR2_PACKAGE_RPI_FFMPEG_EXTRACONF
+	string "Additional parameters for ./configure"
+	default ""
+	help
+	  Extra parameters that will be appended to FFmpeg's
+	  ./configure commandline.
+
+endif
+
+comment "ffmpeg needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/buildroot/package/rpi-ffmpeg/rpi-ffmpeg.mk b/buildroot/package/rpi-ffmpeg/rpi-ffmpeg.mk
new file mode 100644
index 0000000..4a5d7be
--- /dev/null
+++ b/buildroot/package/rpi-ffmpeg/rpi-ffmpeg.mk
@@ -0,0 +1,607 @@
+################################################################################
+#
+# rpi-ffmpeg
+#
+################################################################################
+
+RPI_FFMPEG_VERSION = 7babe664191350e932a75a623a5681084a8a5ece # release/5.1/main
+RPI_FFMPEG_SITE = $(call github,jc-kynesim,rpi-ffmpeg,$(RPI_FFMPEG_VERSION))
+#RPI_FFMPEG_SITE_METHOD = git
+RPI_FFMPEG_INSTALL_STAGING = YES
+
+RPI_FFMPEG_LICENSE = LGPL-2.1+, libjpeg license
+RPI_FFMPEG_LICENSE_FILES = LICENSE.md COPYING.LGPLv2.1
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_GPL),y)
+RPI_FFMPEG_LICENSE += and GPL-2.0+
+RPI_FFMPEG_LICENSE_FILES += COPYING.GPLv2
+endif
+
+RPI_FFMPEG_CONF_OPTS = \
+	--prefix=/usr \
+	--enable-avfilter \
+	--disable-version3 \
+	--enable-logging \
+	--enable-optimizations \
+	--disable-extra-warnings \
+	--enable-avdevice \
+	--enable-avcodec \
+	--enable-avformat \
+	--enable-network \
+	--disable-gray \
+	--enable-swscale-alpha \
+	--disable-small \
+	--disable-crystalhd \
+	--disable-dxva2 \
+	--enable-runtime-cpudetect \
+	--disable-hardcoded-tables \
+	--disable-mipsdsp \
+	--disable-mipsdspr2 \
+	--disable-msa \
+	--enable-hwaccels \
+	--disable-cuda \
+	--disable-cuvid \
+	--disable-nvenc \
+	--disable-avisynth \
+	--disable-frei0r \
+	--disable-libopencore-amrnb \
+	--disable-libopencore-amrwb \
+	--disable-libdc1394 \
+	--disable-libgsm \
+	--disable-libilbc \
+	--disable-libvo-amrwbenc \
+	--disable-symver \
+	--disable-doc
+
+RPI_FFMPEG_DEPENDENCIES += host-pkgconf
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_GPL),y)
+RPI_FFMPEG_CONF_OPTS += --enable-gpl
+else
+RPI_FFMPEG_CONF_OPTS += --disable-gpl
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_NONFREE),y)
+RPI_FFMPEG_CONF_OPTS += --enable-nonfree
+else
+RPI_FFMPEG_CONF_OPTS += --disable-nonfree
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_FFMPEG),y)
+RPI_FFMPEG_CONF_OPTS += --enable-ffmpeg
+else
+RPI_FFMPEG_CONF_OPTS += --disable-ffmpeg
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_FFPLAY),y)
+RPI_FFMPEG_DEPENDENCIES += sdl2
+RPI_FFMPEG_CONF_OPTS += --enable-ffplay
+RPI_FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl2-config
+else
+RPI_FFMPEG_CONF_OPTS += --disable-ffplay
+endif
+
+ifeq ($(BR2_PACKAGE_JACK1),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libjack
+RPI_FFMPEG_DEPENDENCIES += jack1
+else ifeq ($(BR2_PACKAGE_JACK2),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libjack
+RPI_FFMPEG_DEPENDENCIES += jack2
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libjack
+endif
+
+ifeq ($(BR2_PACKAGE_LIBV4L),y)
+RPI_FFMPEG_DEPENDENCIES += libv4l
+RPI_FFMPEG_CONF_OPTS += --enable-libv4l2
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libv4l2
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_FFPROBE),y)
+RPI_FFMPEG_CONF_OPTS += --enable-ffprobe
+else
+RPI_FFMPEG_CONF_OPTS += --disable-ffprobe
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_XCBGRAB),y)
+RPI_FFMPEG_CONF_OPTS += \
+	--enable-libxcb \
+	--enable-libxcb-shape \
+	--enable-libxcb-shm \
+	--enable-libxcb-xfixes
+RPI_FFMPEG_DEPENDENCIES += libxcb
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libxcb
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_POSTPROC),y)
+RPI_FFMPEG_CONF_OPTS += --enable-postproc
+else
+RPI_FFMPEG_CONF_OPTS += --disable-postproc
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_SWSCALE),y)
+RPI_FFMPEG_CONF_OPTS += --enable-swscale
+else
+RPI_FFMPEG_CONF_OPTS += --disable-swscale
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_ENCODERS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-encoders \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_ENCODERS)),--enable-encoder=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_DECODERS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-decoders \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_DECODERS)),--enable-decoder=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_MUXERS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-muxers \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_MUXERS)),--enable-muxer=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_DEMUXERS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-demuxers \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_DEMUXERS)),--enable-demuxer=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_PARSERS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-parsers \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_PARSERS)),--enable-parser=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_BSFS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-bsfs \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_BSFS)),--enable-bsf=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_PROTOCOLS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-protocols \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_PROTOCOLS)),--enable-protocol=$(x))
+endif
+
+ifneq ($(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_FILTERS)),all)
+RPI_FFMPEG_CONF_OPTS += --disable-filters \
+	$(foreach x,$(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_FILTERS)),--enable-filter=$(x))
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_INDEVS),y)
+RPI_FFMPEG_CONF_OPTS += --enable-indevs
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+RPI_FFMPEG_CONF_OPTS += --enable-alsa
+RPI_FFMPEG_DEPENDENCIES += alsa-lib
+else
+RPI_FFMPEG_CONF_OPTS += --disable-alsa
+endif
+else
+RPI_FFMPEG_CONF_OPTS += --disable-indevs
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_OUTDEVS),y)
+RPI_FFMPEG_CONF_OPTS += --enable-outdevs
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+RPI_FFMPEG_DEPENDENCIES += alsa-lib
+endif
+else
+RPI_FFMPEG_CONF_OPTS += --disable-outdevs
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+RPI_FFMPEG_CONF_OPTS += --enable-pthreads
+else
+RPI_FFMPEG_CONF_OPTS += --disable-pthreads
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+RPI_FFMPEG_CONF_OPTS += --enable-zlib
+RPI_FFMPEG_DEPENDENCIES += zlib
+else
+RPI_FFMPEG_CONF_OPTS += --disable-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+RPI_FFMPEG_CONF_OPTS += --enable-bzlib
+RPI_FFMPEG_DEPENDENCIES += bzip2
+else
+RPI_FFMPEG_CONF_OPTS += --disable-bzlib
+endif
+
+ifeq ($(BR2_PACKAGE_FDK_AAC)$(BR2_PACKAGE_RPI_FFMPEG_NONFREE),yy)
+RPI_FFMPEG_CONF_OPTS += --enable-libfdk-aac
+RPI_FFMPEG_DEPENDENCIES += fdk-aac
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libfdk-aac
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy)
+RPI_FFMPEG_CONF_OPTS += --enable-libcdio
+RPI_FFMPEG_DEPENDENCIES += libcdio-paranoia
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libcdio
+endif
+
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+RPI_FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
+RPI_FFMPEG_DEPENDENCIES += gnutls
+else
+RPI_FFMPEG_CONF_OPTS += --disable-gnutls
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+# openssl isn't license compatible with GPL
+ifeq ($(BR2_PACKAGE_RPI_FFMPEG_GPL)x$(BR2_PACKAGE_RPI_FFMPEG_NONFREE),yx)
+RPI_FFMPEG_CONF_OPTS += --disable-openssl
+else
+RPI_FFMPEG_CONF_OPTS += --enable-openssl
+RPI_FFMPEG_DEPENDENCIES += openssl
+endif
+else
+RPI_FFMPEG_CONF_OPTS += --disable-openssl
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDRM),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libdrm
+RPI_FFMPEG_DEPENDENCIES += libdrm
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libdrm
+endif
+
+ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libopenh264
+RPI_FFMPEG_DEPENDENCIES += libopenh264
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libopenh264
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+RPI_FFMPEG_DEPENDENCIES += libvorbis
+RPI_FFMPEG_CONF_OPTS += \
+	--enable-libvorbis \
+	--enable-muxer=ogg \
+	--enable-encoder=libvorbis
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVA),y)
+RPI_FFMPEG_CONF_OPTS += --enable-vaapi
+RPI_FFMPEG_DEPENDENCIES += libva
+else
+RPI_FFMPEG_CONF_OPTS += --disable-vaapi
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVDPAU),y)
+RPI_FFMPEG_CONF_OPTS += --enable-vdpau
+RPI_FFMPEG_DEPENDENCIES += libvdpau
+else
+RPI_FFMPEG_CONF_OPTS += --disable-vdpau
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+RPI_FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi \
+	--extra-cflags=-I$(STAGING_DIR)/usr/include/IL
+RPI_FFMPEG_DEPENDENCIES += rpi-userland
+ifeq ($(BR2_arm),y)
+RPI_FFMPEG_CONF_OPTS += --enable-mmal
+else
+RPI_FFMPEG_CONF_OPTS += --disable-mmal
+endif
+else
+RPI_FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
+endif
+
+# To avoid a circular dependency only use opencv if opencv itself does
+# not depend on ffmpeg.
+ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx)
+RPI_FFMPEG_CONF_OPTS += --enable-libopencv
+RPI_FFMPEG_DEPENDENCIES += opencv3
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libopencv
+endif
+
+ifeq ($(BR2_PACKAGE_OPUS),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libopus
+RPI_FFMPEG_DEPENDENCIES += opus
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libopus
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVPX),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libvpx
+RPI_FFMPEG_DEPENDENCIES += libvpx
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libvpx
+endif
+
+ifeq ($(BR2_PACKAGE_LIBASS),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libass
+RPI_FFMPEG_DEPENDENCIES += libass
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libass
+endif
+
+ifeq ($(BR2_PACKAGE_LIBBLURAY),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libbluray
+RPI_FFMPEG_DEPENDENCIES += libbluray
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libbluray
+endif
+
+ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
+RPI_FFMPEG_CONF_OPTS += --enable-librtmp
+RPI_FFMPEG_DEPENDENCIES += rtmpdump
+else
+RPI_FFMPEG_CONF_OPTS += --disable-librtmp
+endif
+
+ifeq ($(BR2_PACKAGE_LAME),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libmp3lame
+RPI_FFMPEG_DEPENDENCIES += lame
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libmp3lame
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libmodplug
+RPI_FFMPEG_DEPENDENCIES += libmodplug
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libmodplug
+endif
+
+ifeq ($(BR2_PACKAGE_LIBOPENMPT),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libopenmpt
+RPI_FFMPEG_DEPENDENCIES += libopenmpt
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libopenmpt
+endif
+
+ifeq ($(BR2_PACKAGE_SPEEX),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libspeex
+RPI_FFMPEG_DEPENDENCIES += speex
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libspeex
+endif
+
+ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libtheora
+RPI_FFMPEG_DEPENDENCIES += libtheora
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libtheora
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+RPI_FFMPEG_CONF_OPTS += --enable-iconv
+RPI_FFMPEG_DEPENDENCIES += libiconv
+else
+RPI_FFMPEG_CONF_OPTS += --disable-iconv
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libxml2
+RPI_FFMPEG_DEPENDENCIES += libxml2
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libxml2
+endif
+
+# ffmpeg freetype support require fenv.h which is only
+# available/working on glibc.
+# The microblaze variant doesn't provide the needed exceptions
+ifeq ($(BR2_PACKAGE_FREETYPE)$(BR2_TOOLCHAIN_USES_GLIBC)x$(BR2_microblaze),yyx)
+RPI_FFMPEG_CONF_OPTS += --enable-libfreetype
+RPI_FFMPEG_DEPENDENCIES += freetype
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libfreetype
+endif
+
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+RPI_FFMPEG_CONF_OPTS += --enable-fontconfig
+RPI_FFMPEG_DEPENDENCIES += fontconfig
+else
+RPI_FFMPEG_CONF_OPTS += --disable-fontconfig
+endif
+
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libfribidi
+RPI_FFMPEG_DEPENDENCIES += libfribidi
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libfribidi
+endif
+
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libopenjpeg
+RPI_FFMPEG_DEPENDENCIES += openjpeg
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libopenjpeg
+endif
+
+ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_RPI_FFMPEG_GPL),yy)
+RPI_FFMPEG_CONF_OPTS += --enable-libx264
+RPI_FFMPEG_DEPENDENCIES += x264
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libx264
+endif
+
+ifeq ($(BR2_PACKAGE_X265)$(BR2_PACKAGE_RPI_FFMPEG_GPL),yy)
+RPI_FFMPEG_CONF_OPTS += --enable-libx265
+RPI_FFMPEG_DEPENDENCIES += x265
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libx265
+endif
+
+ifeq ($(BR2_PACKAGE_DAV1D),y)
+RPI_FFMPEG_CONF_OPTS += --enable-libdav1d
+RPI_FFMPEG_DEPENDENCIES += dav1d
+else
+RPI_FFMPEG_CONF_OPTS += --disable-libdav1d
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_MMX),y)
+RPI_FFMPEG_CONF_OPTS += --enable-x86asm
+RPI_FFMPEG_DEPENDENCIES += host-nasm
+else
+RPI_FFMPEG_CONF_OPTS += --disable-x86asm
+RPI_FFMPEG_CONF_OPTS += --disable-mmx
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+RPI_FFMPEG_CONF_OPTS += --enable-sse
+else
+RPI_FFMPEG_CONF_OPTS += --disable-sse
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+RPI_FFMPEG_CONF_OPTS += --enable-sse2
+else
+RPI_FFMPEG_CONF_OPTS += --disable-sse2
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
+RPI_FFMPEG_CONF_OPTS += --enable-sse3
+else
+RPI_FFMPEG_CONF_OPTS += --disable-sse3
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
+RPI_FFMPEG_CONF_OPTS += --enable-ssse3
+else
+RPI_FFMPEG_CONF_OPTS += --disable-ssse3
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
+RPI_FFMPEG_CONF_OPTS += --enable-sse4
+else
+RPI_FFMPEG_CONF_OPTS += --disable-sse4
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
+RPI_FFMPEG_CONF_OPTS += --enable-sse42
+else
+RPI_FFMPEG_CONF_OPTS += --disable-sse42
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_AVX),y)
+RPI_FFMPEG_CONF_OPTS += --enable-avx
+else
+RPI_FFMPEG_CONF_OPTS += --disable-avx
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_AVX2),y)
+RPI_FFMPEG_CONF_OPTS += --enable-avx2
+else
+RPI_FFMPEG_CONF_OPTS += --disable-avx2
+endif
+
+# Explicitly disable everything that doesn't match for ARM
+# FFMPEG "autodetects" by compiling an extended instruction via AS
+# This works on compilers that aren't built for generic by default
+ifeq ($(BR2_ARM_CPU_ARMV4),y)
+RPI_FFMPEG_CONF_OPTS += --disable-armv5te
+endif
+ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
+RPI_FFMPEG_CONF_OPTS += --enable-armv6
+else
+RPI_FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2
+endif
+ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y)
+RPI_FFMPEG_CONF_OPTS += --enable-vfp
+else
+RPI_FFMPEG_CONF_OPTS += --disable-vfp
+endif
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+RPI_FFMPEG_CONF_OPTS += --enable-neon
+else ifeq ($(BR2_aarch64),y)
+RPI_FFMPEG_CONF_OPTS += --enable-neon
+else
+RPI_FFMPEG_CONF_OPTS += --disable-neon
+endif
+
+ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
+ifeq ($(BR2_MIPS_SOFT_FLOAT),y)
+RPI_FFMPEG_CONF_OPTS += --disable-mipsfpu
+else
+RPI_FFMPEG_CONF_OPTS += --enable-mipsfpu
+endif
+
+# Fix build failure on several missing assembly instructions
+RPI_FFMPEG_CONF_OPTS += --disable-asm
+endif # MIPS
+
+ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC):$(BR2_powerpc64le),y:)
+RPI_FFMPEG_CONF_OPTS += --enable-altivec
+else ifeq ($(BR2_POWERPC_CPU_HAS_VSX):$(BR2_powerpc64le),y:y)
+# On LE, ffmpeg AltiVec support needs VSX intrinsics, and VSX
+# is an extension to AltiVec.
+RPI_FFMPEG_CONF_OPTS += --enable-altivec
+else
+RPI_FFMPEG_CONF_OPTS += --disable-altivec
+endif
+
+# Fix build failure on several missing assembly instructions
+ifeq ($(BR2_RISCV_32),y)
+RPI_FFMPEG_CONF_OPTS += --disable-rvv --disable-asm
+endif
+
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+RPI_FFMPEG_CONF_OPTS += --extra-libs=-latomic
+endif
+
+ifeq ($(BR2_STATIC_LIBS),)
+RPI_FFMPEG_CONF_OPTS += --enable-pic
+else
+RPI_FFMPEG_CONF_OPTS += --disable-pic
+endif
+
+# Default to --cpu=generic for MIPS architecture, in order to avoid a
+# warning from ffmpeg's configure script.
+ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
+RPI_FFMPEG_CONF_OPTS += --cpu=generic
+else ifneq ($(GCC_TARGET_CPU),)
+RPI_FFMPEG_CONF_OPTS += --cpu="$(GCC_TARGET_CPU)"
+else ifneq ($(GCC_TARGET_ARCH),)
+RPI_FFMPEG_CONF_OPTS += --cpu="$(GCC_TARGET_ARCH)"
+endif
+
+RPI_FFMPEG_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
+RPI_FFMPEG_CONF_OPTS += --disable-optimizations
+RPI_FFMPEG_CFLAGS += -O0
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
+RPI_FFMPEG_CONF_OPTS += --disable-optimizations
+RPI_FFMPEG_CFLAGS += -O0
+endif
+
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
+RPI_FFMPEG_CFLAGS += -marm
+endif
+
+RPI_FFMPEG_CONF_ENV += CFLAGS="$(RPI_FFMPEG_CFLAGS)"
+RPI_FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_RPI_FFMPEG_EXTRACONF))
+
+# Override RPI_FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
+define RPI_FFMPEG_CONFIGURE_CMDS
+	(cd $(RPI_FFMPEG_SRCDIR) && rm -rf config.cache && \
+	$(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_CONFIGURE_ARGS) \
+	$(RPI_FFMPEG_CONF_ENV) \
+	./configure \
+		--enable-cross-compile \
+		--cross-prefix=$(TARGET_CROSS) \
+		--sysroot=$(STAGING_DIR) \
+		--host-cc="$(HOSTCC)" \
+		--arch=$(BR2_ARCH) \
+		--target-os="linux" \
+		--disable-stripping \
+		--pkg-config="$(PKG_CONFIG_HOST_BINARY)" \
+		$(SHARED_STATIC_LIBS_OPTS) \
+		$(RPI_FFMPEG_CONF_OPTS) \
+	)
+endef
+
+define RPI_FFMPEG_REMOVE_EXAMPLE_SRC_FILES
+	rm -rf $(TARGET_DIR)/usr/share/ffmpeg/examples
+endef
+RPI_FFMPEG_POST_INSTALL_TARGET_HOOKS += RPI_FFMPEG_REMOVE_EXAMPLE_SRC_FILES
+
+$(eval $(autotools-package))