diff options
| author | root <root@rshg054.dnsready.net> | 2013-02-27 00:03:49 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-02-27 00:03:49 -0800 |
| commit | 23018fec360e50c7cb4de4b2411650ce79532e54 (patch) | |
| tree | 766004a81e02dd8a2ea0d5092ce2d19aed799bf6 /extra/ffmpeg | |
| parent | 32e4cb82a73f6efc4254917e6324a2b61ecb5ddc (diff) | |
Wed Feb 27 00:03:48 PST 2013
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/ffmpeg/h264-vdpau.patch | 26 |
2 files changed, 5 insertions, 34 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 2662b40e5..ea369be40 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z ioni $ +# $Id: PKGBUILD 178756 2013-02-26 18:03:18Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.1.2 -pkgrel=3 +pkgver=1.1.3 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -18,15 +18,12 @@ depends=( 'v4l-utils' 'x264' 'xvidcore' 'zlib' ) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 - h264-vdpau.patch) -sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce' - 'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +sha256sums=('a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8') build() { cd $pkgname-$pkgver - patch -Np1 -i ../h264-vdpau.patch ./configure \ --prefix=/usr \ --disable-debug \ diff --git a/extra/ffmpeg/h264-vdpau.patch b/extra/ffmpeg/h264-vdpau.patch deleted file mode 100644 index 75ebe306f..000000000 --- a/extra/ffmpeg/h264-vdpau.patch +++ /dev/null @@ -1,26 +0,0 @@ -X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b - -diff --git a/libavcodec/h264.c b/libavcodec/h264.c -index 56ef109..da749a2 100644 ---- a/libavcodec/h264.c -+++ b/libavcodec/h264.c -@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h) - return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P - : AV_PIX_FMT_YUV422P; - } else { -- return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ? -+ int i; -+ const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ? - s->avctx->codec->pix_fmts : - s->avctx->color_range == AVCOL_RANGE_JPEG ? - hwaccel_pixfmt_list_h264_jpeg_420 : -- ff_hwaccel_pixfmt_list_420); -+ ff_hwaccel_pixfmt_list_420; -+ -+ for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++) -+ if (fmt[i] == s->avctx->pix_fmt) -+ return fmt[i]; -+ return s->avctx->get_format(s->avctx, fmt); - } - break; - default: |