diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-12 03:59:45 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-12 03:59:45 +0000 |
| commit | d8679f0250762892ab1e1a6d71badc2e9d42a526 (patch) | |
| tree | 2c5893ffb5a88532e043973210221d10ce07f808 /extra/ffmpeg | |
| parent | 10cc2a54e50ad4aeffd7152937670c8673a096f9 (diff) | |
Sat Apr 12 03:57:05 UTC 2014
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/0001-libx265-Support-API-version-9.patch | 50 | ||||
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 19 |
2 files changed, 63 insertions, 6 deletions
diff --git a/extra/ffmpeg/0001-libx265-Support-API-version-9.patch b/extra/ffmpeg/0001-libx265-Support-API-version-9.patch new file mode 100644 index 000000000..3b6a6e24c --- /dev/null +++ b/extra/ffmpeg/0001-libx265-Support-API-version-9.patch @@ -0,0 +1,50 @@ +From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001 +From: Derek Buitenhuis <derek.buitenhuis@gmail.com> +Date: Thu, 6 Mar 2014 20:01:17 +0000 +Subject: [PATCH] libx265: Support API version 9 + +Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> +--- + configure | 4 ++-- + libavcodec/libx265.c | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure b/configure +index d3f5f33..4d7382a 100755 +--- a/configure ++++ b/configure +@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 & + { check_cpp_condition x264.h "X264_BUILD >= 118" || + die "ERROR: libx264 version must be >= 0.118."; } + enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode && +- { check_cpp_condition x265.h "X265_BUILD >= 7" || +- die "ERROR: libx265 version must be >= 7."; } ++ { check_cpp_condition x265.h "X265_BUILD >= 9" || ++ die "ERROR: libx265 version must be >= 9."; } + enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs + enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore + enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || +diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c +index 961fc74..a6e4193 100644 +--- a/libavcodec/libx265.c ++++ b/libavcodec/libx265.c +@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) + av_reduce(&sar_num, &sar_den, + avctx->sample_aspect_ratio.num, + avctx->sample_aspect_ratio.den, 4096); +- ctx->params->bEnableVuiParametersPresentFlag = 1; +- ctx->params->bEnableAspectRatioIdc = 1; +- ctx->params->aspectRatioIdc = 255; +- ctx->params->sarWidth = sar_num; +- ctx->params->sarHeight = sar_den; ++ ctx->params->vui.bEnableVuiParametersPresentFlag = 1; ++ ctx->params->vui.bEnableAspectRatioIdc = 1; ++ ctx->params->vui.aspectRatioIdc = 255; ++ ctx->params->vui.sarWidth = sar_num; ++ ctx->params->vui.sarHeight = sar_den; + + if (x265_max_bit_depth == 8) + ctx->params->internalBitDepth = 8; +-- +1.7.10.4 + diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index d334d5934..5edf28227 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 208905 2014-03-28 15:46:19Z bpiotrowski $ +# $Id: PKGBUILD 210158 2014-04-10 14:28:28Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.2 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -19,9 +19,16 @@ depends=( 'v4l-utils' 'x264' 'xvidcore' 'zlib' 'x265' ) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('744febca199548c9393b1f1ed05ccdd8' - 'SKIP') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc} + 0001-libx265-Support-API-version-9.patch) +md5sums=('b8a1ee4964c2638f46fcc803ed453818' + 'SKIP' + '4cbf9b13dc013e96be36445b4a2bfdac') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../0001-libx265-Support-API-version-9.patch +} build() { cd $pkgname-$pkgver |