Thu Apr 2 22:40:04 2015 UTC ()
Update to 2.6.1:

version 2.6.1:
- avformat/mov: Disallow ".." in dref unless use_absolute_path is set
- avfilter/palettegen: make sure at least one frame was sent to the filter
- avformat/mov: Check for string truncation in mov_open_dref()
- ac3_fixed: fix out-of-bound read
- mips/asmdefs: use _ABI64 as defined by gcc
- hevc: delay ff_thread_finish_setup for hwaccel
- avcodec/012v: Check dimensions more completely
- asfenc: fix leaking asf->index_ptr on error
- roqvideoenc: set enc->avctx in roq_encode_init
- avcodec/options_table: remove extradata_size from the AVOptions table
- ffmdec: limit the backward seek to the last resync position
- Add dependencies to configure file for vf_fftfilt
- ffmdec: make sure the time base is valid
- ffmdec: fix infinite loop at EOF
- ffmdec: initialize f_cprv, f_stvi and f_stau
- arm: Suppress tags about used cpu arch and extensions
- mxfdec: Fix the error handling for when strftime fails
- avcodec/opusdec: Fix delayed sample value
- avcodec/opusdec: Clear out pointers per packet
- avcodec/utils: Align YUV411 by as much as the other YUV variants
- lavc/hevcdsp: Fix compilation for arm with --disable-neon.
- vp9: fix segmentation map retention with threading enabled.
- Revert "avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit"


(wiz)
diff -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg2/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c
cvs diff -r1.30 -r1.31 pkgsrc/multimedia/ffmpeg2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2015/03/08 08:10:13 1.30
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2015/04/02 22:40:04 1.31
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.30 2015/03/08 08:10:13 adam Exp $ 1# $NetBSD: Makefile.common,v 1.31 2015/04/02 22:40:04 wiz Exp $
2# used by multimedia/ffmpeg2/Makefile 2# used by multimedia/ffmpeg2/Makefile
3# used by multimedia/ffplay2/Makefile 3# used by multimedia/ffplay2/Makefile
4 4
5DISTNAME= ffmpeg-2.6 5DISTNAME= ffmpeg-2.6.1
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PREV_PKGPATH= multimedia/ffmpeg-devel 12PREV_PKGPATH= multimedia/ffmpeg-devel
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
14 14
15USE_LANGUAGES= c99 15USE_LANGUAGES= c99
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake texi2html pod2man 17USE_TOOLS+= gmake texi2html pod2man
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
cvs diff -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg2/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/distinfo 2015/03/08 08:10:13 1.29
+++ pkgsrc/multimedia/ffmpeg2/distinfo 2015/04/02 22:40:04 1.30
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.29 2015/03/08 08:10:13 adam Exp $ 1$NetBSD: distinfo,v 1.30 2015/04/02 22:40:04 wiz Exp $
2 2
3SHA1 (ffmpeg-2.6.tar.bz2) = 3bfc61fc3906373aecaaa523a9d13cfa9ff7e7ed 3SHA1 (ffmpeg-2.6.1.tar.bz2) = dfcd13e7c3e65a59cbe4cab85718ae84da824c5b
4RMD160 (ffmpeg-2.6.tar.bz2) = 86c4af5b3f43fde318a7a8557f6787449a4d28c5 4RMD160 (ffmpeg-2.6.1.tar.bz2) = afc79afe41f1596e4b8b4dd663db6527602db703
5Size (ffmpeg-2.6.tar.bz2) = 7799342 bytes 5Size (ffmpeg-2.6.1.tar.bz2) = 7802246 bytes
6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 6SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
7SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179 7SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179
8SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f 8SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f
9SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e 9SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
10SHA1 (patch-libavutil_opencl.c) = 46da890f06ab3db7fbed84aff0f6f30fa1d2adfe 10SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
11SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 11SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
12SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f 12SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg2/patches/Attic/patch-libavutil_opencl.c (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/patches/Attic/patch-libavutil_opencl.c 2015/03/08 08:10:13 1.1
+++ pkgsrc/multimedia/ffmpeg2/patches/Attic/patch-libavutil_opencl.c 2015/04/02 22:40:04 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-libavutil_opencl.c,v 1.1 2015/03/08 08:10:13 adam Exp $ 1$NetBSD: patch-libavutil_opencl.c,v 1.2 2015/04/02 22:40:04 wiz Exp $
2 2
3Fix undeclared identifier error. 3Fix undeclared identifier error.
4 4
5--- libavutil/opencl.c.orig 2015-03-08 07:52:00.000000000 +0000 5--- libavutil/opencl.c.orig 2015-03-16 19:26:04.000000000 +0000
6+++ libavutil/opencl.c 6+++ libavutil/opencl.c
7@@ -611,7 +611,7 @@ void av_opencl_uninit(void) 7@@ -423,7 +423,7 @@ cl_program av_opencl_compile(const char
8 } 8 cl_program program = NULL;
9 opencl_ctx.context = NULL; 9
10 } 10 LOCK_OPENCL;
11- for (i = 0; i < opencl_ctx.kernel_code_count; i++) { 11- for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
12+ for (int i = 0; i < opencl_ctx.kernel_code_count; i++) { 12+ for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
13 opencl_ctx.kernel_code[i].is_compiled = 0; 13 // identify a program using a unique name within the kernel source
14 } 14 ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
15 free_device_list(&opencl_ctx.device_list); 15 if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {