diff options
| author | adam <adam> | 2014-04-11 07:42:30 +0000 |
|---|---|---|
| committer | adam <adam> | 2014-04-11 07:42:30 +0000 |
| commit | bcea262071d7aa4ea8ca7e3a733b63b0931980c9 (patch) | |
| tree | 02284c47350c9362f39d42c5ca7aaa9380b376e1 /multimedia/ffmpeg2 | |
| parent | 69cad717a2e590ec22d154220efbd3c2eec24562 (diff) | |
| download | pkgsrc-bcea262071d7aa4ea8ca7e3a733b63b0931980c9.tar.gz | |
Changes 2.2.1:
* avcodec/dirac_arith: Fix build with PIC and stack-check options
* swscale/x86/swscale_template: loose hardcoded dstw_offset
* swresample/resample: use av_malloc_array() where appropriate
* swresample/dither: use av_malloc_array()
* swresample/resample: Limit filter length
* avcodec/msrle: check return code for success before use
* avcodec/pthread_frame: fix missing unlock on error
* examples/avio_reading: fix null dereference on error
* avformat/omadec: fix probetest failure
* avcodec/wma: use av_freep(), do not leave stale pointers in memory
* lavu/opt: validate range before dereference
* avcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thread_context()
* avfilter/vf_pullup: fix gray8
* avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults
Diffstat (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/distinfo | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index a55506a2017..4bba4c6562f 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2014/04/10 05:39:14 obache Exp $ +# $NetBSD: Makefile,v 1.7 2014/04/11 07:42:30 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index 779b11d7f39..af7f5f0106b 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.11 2014/04/01 10:51:49 adam Exp $ +# $NetBSD: Makefile.common,v 1.12 2014/04/11 07:42:30 adam Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile -DISTNAME= ffmpeg-2.2 +DISTNAME= ffmpeg-2.2.1 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 -LDFLAGS+= -Wl,-R${PREFIX}/lib/ffmpeg2 +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2 PLIST_VARS+= opencl diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo index 8bad4a0b09e..427cf4114b4 100644 --- a/multimedia/ffmpeg2/distinfo +++ b/multimedia/ffmpeg2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2014/04/01 10:51:49 adam Exp $ +$NetBSD: distinfo,v 1.10 2014/04/11 07:42:30 adam Exp $ -SHA1 (ffmpeg-2.2.tar.bz2) = 889a3a802e2ae9de2758e55c0ccae168d6b3301a -RMD160 (ffmpeg-2.2.tar.bz2) = 5c0c764df7bf80b2b4cecc414dfd2b2cd41053e3 -Size (ffmpeg-2.2.tar.bz2) = 7024765 bytes +SHA1 (ffmpeg-2.2.1.tar.bz2) = c5f8d103b20cd73d329401d85ced4a014757f8b9 +RMD160 (ffmpeg-2.2.1.tar.bz2) = 4e6bd43ca558b10708375ad294e242dc654173af +Size (ffmpeg-2.2.1.tar.bz2) = 7024592 bytes SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-configure) = 032f7386bf68240971d0d6a59e291d48f23acf32 SHA1 (patch-libavcodec_libx265.c) = 121113876a1089f07b4dc65c26a0a552b0d25d0d |