소스 검색

update Enable System DL patch

Carola Nitz 7 년 전
부모
커밋
c41a4e1809
1개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 6
      Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch

+ 6 - 6
Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch

@@ -1,7 +1,7 @@
-From 878cd2e9ab9041f692a21bc38f8b2566dce27cd1 Mon Sep 17 00:00:00 2001
+From 4ee714e761c1ec2c59bdbaf72dbacf6b4e88fb3d 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
+Subject: [PATCH] Enable System DL
 
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
@@ -36,10 +36,10 @@ 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 41d16a4fb2..3e5f910e99 100644
+index b5ad263ec7..e245b75de1 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
-@@ -24,6 +24,9 @@ FFMPEGCONF = \
+@@ -26,6 +26,9 @@ FFMPEGCONF = \
  	--disable-decoder=opus \
  	--enable-libgsm \
  	--enable-libopenjpeg \
@@ -51,12 +51,12 @@ index 41d16a4fb2..3e5f910e99 100644
  	--disable-devices \
 @@ -227,6 +230,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
  ifdef USE_FFMPEG
- 	$(APPLY) $(SRC)/ffmpeg/force-unicode.patch
+ 	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
  endif
 +	$(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
  	$(MOVE)
  
  .ffmpeg: ffmpeg
 -- 
-2.15.0
+2.13.5 (Apple Git-94)