Commit f65d041d authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Merge branch 'ffmpeg-4' into 'master'

[ffmpeg] rebuild to build with freetype 2.9

See merge request !412
parents 9d9b12e3 8614f0d4
Pipeline #29387 passed with stage
in 23 minutes and 45 seconds
......@@ -22,10 +22,10 @@ unset pkg_config
--disable-openssl \
--disable-gnutls \
--enable-libvpx \
--enable-libopenh264 \
--enable-libopus \
--enable-pthreads \
--enable-postproc
--enable-libopus \
--enable-postproc \
--enable-libopenh264
make -j${CPU_COUNT} ${VERBOSE_AT}
make install -j${CPU_COUNT} ${VERBOSE_AT}
......@@ -5,8 +5,8 @@ package:
version: {{ version }}
source:
url: https://ffmpeg.org/releases/ffmpeg-{{ version }}.tar.gz
sha256: dc4b1c622baa34fc68d763cd2818e419d1af90271e0506604905f25a46ea8273
url: https://ffmpeg.org/releases/ffmpeg-{{ version }}.tar.gz # [not win]
sha256: dc4b1c622baa34fc68d763cd2818e419d1af90271e0506604905f25a46ea8273 # [not win]
# This patch is required to fix https://trac.macports.org/ticket/55746
# with Xcode < 7.0, where _Nullable attribues are not supported.
# Can probably be removed once the compiler infrastructure is updated.
......@@ -22,7 +22,7 @@ source:
sha256: 8fe2d344463dbefc2db4239a4203a55ed0324faceaae57276a40c4fabda84c37 # [win64]
build:
number: 0
number: 1
# The windows build is repacking binaries rather than building from source
skip: True # [win]
run_exports:
......@@ -36,18 +36,19 @@ requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- pkg-config
- libtool
- yasm
- make
- pkg-config # [not win]
- libtool # [not win]
- yasm # [not win]
- make # [not win]
host:
- bzip2
- zlib
- bzip2 # [not win]
- freetype # [not win]
- libiconv # [osx]
- freetype
- libvpx
- libopus
- zlib # [not win]
- freetype # [not win]
- libvpx # [not win]
- libopus # [not win]
- openh264
test:
......
--- libavcodec/videotoolboxenc.c.old 2018-01-18 17:00:25.000000000 +0100
+++ libavcodec/videotoolboxenc.c 2018-01-24 18:51:02.000000000 +0100
--- libavcodec/videotoolboxenc.c.old 2018-01-18 17:00:25.000000000 +0100
+++ libavcodec/videotoolboxenc.c 2018-01-24 18:51:02.000000000 +0100
@@ -41,7 +41,7 @@ enum { kCMVideoCodecType_HEVC = 'hvc1' }
typedef OSStatus (*getParameterSetAtIndex)(CMFormatDescriptionRef videoDesc,
size_t parameterSetIndex,
- const uint8_t * _Nullable *parameterSetPointerOut,
......
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