diff options
| author | adam <adam@pkgsrc.org> | 2014-07-02 13:49:06 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2014-07-02 13:49:06 +0000 |
| commit | 1e7d8d8a7ead8e032424474b3e9efff3fd6c9d4c (patch) | |
| tree | 79305d3c223b01b1634616ee4bbb15eed29b9aae /multimedia/ffmpeg2 | |
| parent | e82f43bdd603f873f41da0115420ae273d64df86 (diff) | |
| download | pkgsrc-1e7d8d8a7ead8e032424474b3e9efff3fd6c9d4c.tar.gz | |
Changes 2.2.4:
avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it
avformat/cavsvideodec: Fix probing when the file extension is avs
cavsdec: fix qp fixed slice handling
avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.
avcodec/aic: fix quantization table permutation
avutil/lzo: add asserts to be double sure against overflows
avutil/lzo: Fix integer overflow
Show duration for large asf files as written in the file header.
Diffstat (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/distinfo | 8 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/options.mk | 5 |
4 files changed, 9 insertions, 14 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index b70c98bb887..187b3d5dd40 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/07/01 11:23:05 obache Exp $ +# $NetBSD: Makefile,v 1.9 2014/07/02 13:49:06 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} MAINTAINER= pkgsrc-users@NetBSD.org @@ -51,8 +51,4 @@ CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 . endif .endif -.if !empty(PKGSRC_COMPILER:Mclang) -CFLAGS+= -no-integrated-as -.endif - .include "../../multimedia/ffmpeg2/Makefile.common" diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index 6b782b5755e..2dffc1eb6eb 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.14 2014/06/04 11:24:47 adam Exp $ +# $NetBSD: Makefile.common,v 1.15 2014/07/02 13:49:06 adam Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile -DISTNAME= ffmpeg-2.2.3 +DISTNAME= ffmpeg-2.2.4 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo index e4089aed244..2af7d371443 100644 --- a/multimedia/ffmpeg2/distinfo +++ b/multimedia/ffmpeg2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2014/06/04 11:24:47 adam Exp $ +$NetBSD: distinfo,v 1.13 2014/07/02 13:49:06 adam Exp $ -SHA1 (ffmpeg-2.2.3.tar.bz2) = 945e18bf910ae14519eabf8e585e2e946dd58660 -RMD160 (ffmpeg-2.2.3.tar.bz2) = fecd50198ffb0b8b8ca0088361d47785da669128 -Size (ffmpeg-2.2.3.tar.bz2) = 7025230 bytes +SHA1 (ffmpeg-2.2.4.tar.bz2) = 571f36f92709b77808e6ef87a01e47e5df1fe319 +RMD160 (ffmpeg-2.2.4.tar.bz2) = 5ca00088ce5bf66337772b02dacf8f0344863be5 +Size (ffmpeg-2.2.4.tar.bz2) = 7023865 bytes SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-configure) = 032f7386bf68240971d0d6a59e291d48f23acf32 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk index 9ab7928de52..e1e9c588c1b 100644 --- a/multimedia/ffmpeg2/options.mk +++ b/multimedia/ffmpeg2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2014/04/10 06:51:07 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2014/07/02 13:49:06 adam Exp $ # Global and legacy options @@ -98,10 +98,9 @@ CONFIGURE_ARGS+= --disable-libx264 .endif # x265 support -# XXX: x265-devel is NOT yet in pkgsrc, but leave it here for testing purposes .if !empty(PKG_OPTIONS:Mx265) CONFIGURE_ARGS+= --enable-libx265 -#.include "../../multimedia/x265-devel/buildlink3.mk" +.include "../../multimedia/x265/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-libx265 .endif |