[vlc-devel] [PATCH] contrib: add support for ffmpeg-mpv

[Tristan Matthews]

This might be useful for debugging and tracking regressions, thoughts?

---
 contrib/src/ffmpeg/rules.mak | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 41d16a4fb2..0c2668f9e3 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -3,16 +3,25 @@
 #Uncomment the one you want
 #USE_LIBAV ?= 1
 #USE_FFMPEG ?= 1
+#USE_FFMPEG_MPV ?= 1
 
 ifdef USE_FFMPEG
 FFMPEG_HASH=a82468514048fb87d9bf38689866bc3b9aaccd02
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
 else
+ifdef USE_FFMPEG_MPV
+FFMPEG_HASH=a94f4f9a1c0c59240b04364d786c7f8b94da1b02
+FFMPEG_SNAPURL := https://github.com/mpv-player/ffmpeg-mpv/tarball/$(FFMPEG_HASH)
+FFMPEG_GITURL := https://github.com/mpv-player/ffmpeg-mpv
+# inherit the same options as ffmpeg
+USE_FFMPEG := 1
+else
 FFMPEG_HASH=825e463a170c7004c63030dc484b2b2de869227b
 FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := git://git.libav.org/libav.git
 endif
+endif
 
 FFMPEG_BASENAME := $(subst .,_,$(subst \,_,$(subst /,_,$(FFMPEG_HASH))))
 
@@ -34,6 +43,11 @@ FFMPEGCONF = \
 	--disable-bzlib \
 	--disable-avresample
 
+ifdef USE_FFMPEG_MPV
+# Needed for libmp3lame configure-check
+FFMPEGCONF := --extra-ldflags="$(LIBM)"
+endif
+
 ifdef USE_FFMPEG
 FFMPEGCONF += \
 	--disable-swresample \
@@ -225,7 +239,9 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
 	mkdir -p $@-$(FFMPEG_BASENAME)
 	tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
 ifdef USE_FFMPEG
+ifndef USE_FFMPEG_MPV
 	$(APPLY) $(SRC)/ffmpeg/force-unicode.patch
+endif
 endif
 	$(MOVE)
 
-- 
2.15.0.rc2