| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263 |
- From cb41d7ce870dc034cc20a4771fcb2c28b1e30804 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 03/26] Enable System DL
- ---
- 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
- index 0000000000..2d60cf7140
- --- /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
- index 74ea2a5be6..0835f38b8d 100644
- --- a/contrib/src/ffmpeg/rules.mak
- +++ b/contrib/src/ffmpeg/rules.mak
- @@ -27,6 +27,9 @@ FFMPEGCONF = \
- --disable-encoder=vorbis \
- --disable-decoder=opus \
- --enable-libgsm \
- + --disable-decoder=mlp \
- + --disable-demuxer=mlp \
- + --disable-parser=mlp \
- --disable-debug \
- --disable-avdevice \
- --disable-devices \
- @@ -244,6 +247,7 @@ endif
- ifdef USE_LIBAV
- $(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
- endif
- + $(APPLY) $(SRC)/ffmpeg/patch-as-patch-can.patch
- $(MOVE)
-
- .ffmpeg: ffmpeg
- --
- 2.20.1
|
