Commit 5f08d128 authored by Thomas Guillem's avatar Thomas Guillem

update Enable System DL patch

parent 9acf87ab
From 9f2100b18b8b59bc5f2e366b2f689d122e125f7a Mon Sep 17 00:00:00 2001
From 8859086250db0d057e8f763666a056122cf7025c 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 06/14] Enable System DL
......@@ -36,23 +36,23 @@ 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 b31c1e38ce..a98b343ade 100644
index 4a49cbc5be..33b4eaedfe 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -24,6 +24,9 @@ FFMPEGCONF = \
@@ -25,6 +25,9 @@ FFMPEGCONF = \
--disable-encoder=vorbis \
--disable-decoder=opus \
--enable-libgsm \
--enable-libopenjpeg \
+ --disable-decoder=mlp \
+ --disable-demuxer=mlp \
+ --disable-parser=mlp \
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -223,6 +226,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
mkdir -p $@-$(FFMPEG_BASENAME)
tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
@@ -235,6 +238,7 @@ endif
ifdef USE_LIBAV
$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
endif
+ $(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
$(MOVE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment