From 389b61c8ccc252bc1e44b3cf18428e32ecf3ed46 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 10 Oct 2014 12:30:34 +0000 Subject: Changes 1.2.9: * swresample/swresample: fix sample drop loop end condition * avcodec/h264: Check mode before considering mixed mode intra prediction * avformat/mpegts: Check desc_len / get8() return code * avcodec/smc: fix off by 1 error * avcodec/qpeg: fix off by 1 error in MV bounds check * avcodec/gifdec: factorize interleave end handling out * avcodec/cinepak: fix integer underflow * avcodec/pngdec: Calculate MPNG bytewidth more defensively * avcodec/pngdec: Check bits per pixel before setting monoblack pixel format * avcodec/tiff: more completely check bpp/bppcount * avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks * avcodec/utils: Add case for jv to avcodec_align_dimensions2() * more... --- multimedia/ffmpeg1/Makefile | 8 ++------ multimedia/ffmpeg1/Makefile.common | 5 ++--- multimedia/ffmpeg1/distinfo | 8 ++++---- 3 files changed, 8 insertions(+), 13 deletions(-) (limited to 'multimedia/ffmpeg1') diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile index 8147958afb9..bcc85e2cec9 100644 --- a/multimedia/ffmpeg1/Makefile +++ b/multimedia/ffmpeg1/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2014/08/11 23:01:50 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/10/10 12:30:34 adam Exp $ -PKGNAME= ffmpeg1-${DISTVERSION} +PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg1/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v1.x) @@ -53,8 +53,4 @@ CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 . endif .endif -.if !empty(PKGSRC_COMPILER:Mclang) -CFLAGS+= -no-integrated-as -.endif - .include "../../multimedia/ffmpeg1/Makefile.common" diff --git a/multimedia/ffmpeg1/Makefile.common b/multimedia/ffmpeg1/Makefile.common index d5019a790ca..f4315472461 100644 --- a/multimedia/ffmpeg1/Makefile.common +++ b/multimedia/ffmpeg1/Makefile.common @@ -1,15 +1,14 @@ -# $NetBSD: Makefile.common,v 1.2 2014/08/25 18:24:46 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2014/10/10 12:30:34 adam Exp $ # used by multimedia/ffplay1/Makefile # used by multimedia/ffmpeg1/Makefile -DISTNAME= ffmpeg-${DISTVERSION:S/-//g} +DISTNAME= ffmpeg-1.2.9 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 -DISTVERSION= 1.2.8 PREV_PKGPATH= multimedia/ffmpeg PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg1/patches diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo index 2c5615adba2..370c5a55fcb 100644 --- a/multimedia/ffmpeg1/distinfo +++ b/multimedia/ffmpeg1/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2014/08/25 18:24:46 wiz Exp $ +$NetBSD: distinfo,v 1.3 2014/10/10 12:30:34 adam Exp $ -SHA1 (ffmpeg-1.2.8.tar.bz2) = b952b981b2a0f54ae193561df49d25b12a1b586f -RMD160 (ffmpeg-1.2.8.tar.bz2) = bd13c3631e856621c97f04bab51016d6c9d18a62 -Size (ffmpeg-1.2.8.tar.bz2) = 5970565 bytes +SHA1 (ffmpeg-1.2.9.tar.bz2) = 06982276e694a5b37424a14038d0491f0d33984d +RMD160 (ffmpeg-1.2.9.tar.bz2) = 65d89c6316f2fa77a9b5b765eb3ad0f77df91c0e +Size (ffmpeg-1.2.9.tar.bz2) = 5973148 bytes SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e -- cgit v1.2.3