|
@@ -1,4 +1,4 @@
|
|
|
-From 4b383a454629899d4c7574f0989b07b784e905e6 Mon Sep 17 00:00:00 2001
|
|
|
+From 2be3b715533e501857003e8276e336cf60fe39a2 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
|
|
|
Date: Fri, 22 Jul 2016 11:11:44 +0200
|
|
|
Subject: [PATCH 08/17] Enable System DL
|
|
@@ -36,7 +36,7 @@ index 0000000000..2d60cf7140
|
|
|
+ in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
|
|
|
+ in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
|
|
|
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
|
|
|
-index 5ee8a6896a..453e4566b8 100644
|
|
|
+index c37d463706..29b2f6c878 100644
|
|
|
--- a/contrib/src/ffmpeg/rules.mak
|
|
|
+++ b/contrib/src/ffmpeg/rules.mak
|
|
|
@@ -24,6 +24,9 @@ FFMPEGCONF = \
|
|
@@ -49,10 +49,10 @@ index 5ee8a6896a..453e4566b8 100644
|
|
|
--disable-debug \
|
|
|
--disable-avdevice \
|
|
|
--disable-devices \
|
|
|
-@@ -224,6 +227,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
|
|
|
- rm -Rf $@ $@-$(FFMPEG_BASENAME)
|
|
|
- mkdir -p $@-$(FFMPEG_BASENAME)
|
|
|
- tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
|
|
|
+@@ -227,6 +230,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
|
|
|
+ ifdef USE_FFMPEG
|
|
|
+ $(APPLY) $(SRC)/ffmpeg/force-unicode.patch
|
|
|
+ endif
|
|
|
+ $(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
|
|
|
$(MOVE)
|
|
|
|