diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-22 10:28:18 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-22 10:28:18 +0100 |
| commit | 89da12a4917a580d24a76582283195a364de5d2c (patch) | |
| tree | 239bdb76d33dae8ad8ad5406e0db27925862fe5a /extra/ffmpeg | |
| parent | 4199888a832fe0d15a95ab2bd60ae5d4957f86c0 (diff) | |
| parent | 0ab7960ba6a457b7dd3ed5ede0cdb93e816d29a4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/easytag/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/openmpi/PKGBUILD
extra/potrace/PKGBUILD
extra/ptlib/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/ffmpeg/h264-vdpau.patch | 26 |
2 files changed, 33 insertions, 4 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 3230809f3..7eed96c2c 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178128 2013-02-16 22:48:47Z ioni $ +# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z 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=2 +pkgrel=3 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,10 @@ if [ "${CARCH}" != "mips64el" ]; then depends+=('libva') makedepends=('yasm' 'libvdpau') fi -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 + h264-vdpau.patch) +sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce' + 'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42') build() { cd $pkgname-$pkgver @@ -36,6 +38,7 @@ build() { extraconf="" fi + 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 new file mode 100644 index 000000000..75ebe306f --- /dev/null +++ b/extra/ffmpeg/h264-vdpau.patch @@ -0,0 +1,26 @@ +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: |