From 90933e89afd6266f9bdb2b9c9fd93edeffa72e0e Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 11 Mar 2014 10:25:22 +0000 Subject: Changes 1.2.6: * avcodec/utvideoenc: fix slice_bits size * avcodec/snow: split block clipping checks * avcodec/ansi: fix integer overflow * avcodec/msrle: use av_image_get_linesize() to calculate the linesize * avformat/mpegtsenc: Check data array size in mpegts_write_pmt() * avcodec/wmalosslessdec: fix mclms_coeffs* array size * samplefmt: avoid integer overflow in av_samples_get_buffer_size() * avcodec/vc1: reset fcm/field_mode in non advanced header parsing * avcodec/takdec: always check bits_per_raw_sample * avcodec/vmnc: Check that rectangles are within the picture * dnxhdenc: fix mb_rc size * pthread_frame: flush all threads on flush, not just the first one * rtpdec_asf: Copy the need_parsing field from the chained demuxer * Fix compilation on ARM with android gcc 4.7 * Allow decoding of slightly broken Nikon avi files. --- multimedia/ffmpeg/Makefile | 4 ++-- multimedia/ffmpeg/Makefile.common | 4 ++-- multimedia/ffmpeg/distinfo | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index ea715575598..ff8e259203f 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.117 2014/02/20 09:53:15 wiz Exp $ +# $NetBSD: Makefile,v 1.118 2014/03/11 10:25:22 adam Exp $ -PKGNAME= ffmpeg-20140116.${DISTVERSION} +PKGNAME= ffmpeg-20140305.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common index c1fdc0eec2e..73ce03bbe75 100644 --- a/multimedia/ffmpeg/Makefile.common +++ b/multimedia/ffmpeg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2014/02/20 09:53:15 wiz Exp $ +# $NetBSD: Makefile.common,v 1.37 2014/03/11 10:25:22 adam Exp $ # used by multimedia/ffplay/Makefile # used by multimedia/ffmpeg/Makefile @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2 LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 -DISTVERSION= 1.2.5 +DISTVERSION= 1.2.6 PREV_PKGPATH= multimedia/ffmpeg-devel PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 5c0b3544a0f..c61be12028e 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.72 2014/02/20 09:53:15 wiz Exp $ +$NetBSD: distinfo,v 1.73 2014/03/11 10:25:22 adam Exp $ -SHA1 (ffmpeg-1.2.5.tar.bz2) = b154487c1a3e51df9e7c33f2165784e17d6fa947 -RMD160 (ffmpeg-1.2.5.tar.bz2) = 63ea2b1e02a8a954f06a41eb47dc3f06543d48d6 -Size (ffmpeg-1.2.5.tar.bz2) = 5971768 bytes +SHA1 (ffmpeg-1.2.6.tar.bz2) = b38c441bca3644027e2e2cfb3aef587ae43082d6 +RMD160 (ffmpeg-1.2.6.tar.bz2) = 54fe18fc32b9d6893bd3aab9007373499646d643 +Size (ffmpeg-1.2.6.tar.bz2) = 5970714 bytes SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e -- cgit v1.2.3