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"

3 files changed, 16 insertions, 16 deletions

diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 59c01455fe9..33e03f0c9f0 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.30 2015/03/08 08:10:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2015/04/02 22:40:04 wiz Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.6
+DISTNAME=	ffmpeg-2.6.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index 6978f92545e..5886cccd5c0 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2015/03/08 08:10:13 adam Exp $
+$NetBSD: distinfo,v 1.30 2015/04/02 22:40:04 wiz Exp $
 
-SHA1 (ffmpeg-2.6.tar.bz2) = 3bfc61fc3906373aecaaa523a9d13cfa9ff7e7ed
-RMD160 (ffmpeg-2.6.tar.bz2) = 86c4af5b3f43fde318a7a8557f6787449a4d28c5
-Size (ffmpeg-2.6.tar.bz2) = 7799342 bytes
+SHA1 (ffmpeg-2.6.1.tar.bz2) = dfcd13e7c3e65a59cbe4cab85718ae84da824c5b
+RMD160 (ffmpeg-2.6.1.tar.bz2) = afc79afe41f1596e4b8b4dd663db6527602db703
+Size (ffmpeg-2.6.1.tar.bz2) = 7802246 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179
 SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-SHA1 (patch-libavutil_opencl.c) = 46da890f06ab3db7fbed84aff0f6f30fa1d2adfe
+SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
 SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
 SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
diff --git a/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c b/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c
index 8574fc86943..c30be9fa93e 100644
--- a/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c
+++ b/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-libavutil_opencl.c,v 1.1 2015/03/08 08:10:13 adam Exp $
+$NetBSD: patch-libavutil_opencl.c,v 1.2 2015/04/02 22:40:04 wiz Exp $
 
 Fix undeclared identifier error.
 
---- libavutil/opencl.c.orig	2015-03-08 07:52:00.000000000 +0000
+--- libavutil/opencl.c.orig	2015-03-16 19:26:04.000000000 +0000
 +++ libavutil/opencl.c
-@@ -611,7 +611,7 @@ void av_opencl_uninit(void)
-         }
-         opencl_ctx.context = NULL;
-     }
+@@ -423,7 +423,7 @@ cl_program av_opencl_compile(const char 
+     cl_program program = NULL;
+ 
+     LOCK_OPENCL;
 -    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
 +    for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
-         opencl_ctx.kernel_code[i].is_compiled = 0;
-     }
-     free_device_list(&opencl_ctx.device_list);
+         // identify a program using a unique name within the kernel source
+         ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
+         if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {