0003-Enable-System-DL.patch 2.2 KB
Newer Older
Soomin Lee's avatar
Soomin Lee committed
1
From fd74fd58538a01d109f0f3a26df781e19c1fc528 Mon Sep 17 00:00:00 2001
Felix Paul Kühne's avatar
Felix Paul Kühne committed
2 3
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
4
Subject: [PATCH 03/24] Enable System DL
Felix Paul Kühne's avatar
Felix Paul Kühne committed
5 6 7 8 9 10 11 12 13

---
 contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
 contrib/src/ffmpeg/rules.mak                |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 contrib/src/ffmpeg/patch-as-patch-can.patch

diff --git a/contrib/src/ffmpeg/patch-as-patch-can.patch b/contrib/src/ffmpeg/patch-as-patch-can.patch
new file mode 100644
14
index 0000000000..2d60cf7140
Felix Paul Kühne's avatar
Felix Paul Kühne committed
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
--- /dev/null
+++ b/contrib/src/ffmpeg/patch-as-patch-can.patch
@@ -0,0 +1,20 @@
+Only in ffmpeg: .DS_Store
+diff -ru ffmpeg/libavcodec/audiotoolboxdec.c ffmpeg-fix/libavcodec/audiotoolboxdec.c
+--- ffmpeg/libavcodec/audiotoolboxdec.c	2016-05-09 11:44:29.000000000 +0200
++++ ffmpeg-fix/libavcodec/audiotoolboxdec.c	2016-05-09 14:01:04.000000000 +0200
+@@ -345,7 +345,6 @@
+         avctx->bit_rate = bit_rate;
+         in_format.mSampleRate = avctx->sample_rate;
+ #endif
+-#if CONFIG_AC3_AT_DECODER || CONFIG_EAC3_AT_DECODER
+     } else if (pkt && pkt->size >= 7 &&
+                (avctx->codec_id == AV_CODEC_ID_AC3 ||
+                 avctx->codec_id == AV_CODEC_ID_EAC3)) {
+@@ -358,7 +357,6 @@
+         in_format.mChannelsPerFrame = hdr.channels;
+         avctx->frame_size = hdr.num_blocks * 256;
+         avctx->bit_rate = hdr.bit_rate;
+-#endif
+     } else {
+         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
39
index fc68f815a0..4d2d716146 100644
Felix Paul Kühne's avatar
Felix Paul Kühne committed
40 41
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
42
@@ -27,6 +27,9 @@ FFMPEGCONF = \
Thomas Guillem's avatar
Thomas Guillem committed
43
 	--disable-encoder=vorbis \
Felix Paul Kühne's avatar
Felix Paul Kühne committed
44 45
 	--disable-decoder=opus \
 	--enable-libgsm \
Jean-Baptiste Kempf's avatar
Jean-Baptiste Kempf committed
46
+	--disable-decoder=mlp \
Felix Paul Kühne's avatar
Felix Paul Kühne committed
47 48 49 50 51
+	--disable-demuxer=mlp \
+	--disable-parser=mlp \
 	--disable-debug \
 	--disable-avdevice \
 	--disable-devices \
52
@@ -241,6 +244,7 @@ endif
Thomas Guillem's avatar
Thomas Guillem committed
53 54
 ifdef USE_LIBAV
 	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
Thomas Guillem's avatar
Thomas Guillem committed
55
 endif
Felix Paul Kühne's avatar
Felix Paul Kühne committed
56 57 58 59 60
+	$(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
 	$(MOVE)
 
 .ffmpeg: ffmpeg
-- 
61
2.19.1
Felix Paul Kühne's avatar
Felix Paul Kühne committed
62