Changes 2.2.2:

* lavd/opengl_enc: fix pixel data alignment
* ffmpeg: print an error at the end if conversion failed
* avfilter/graphdump: Fix pointer to local outside scope
* ffmpeg_filter: fix pointer to local outside scope
* avcodec/mjpegdec: Fix undefined shift
* avformat/h263dec: Fix h263 probe
* avfilter/filtfmts: Support dynamically allocated in/outputs
* iavcodec/vc1dec: Fix missing {}
* more...

4 files changed, 7 insertions, 32 deletions

diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index af7f5f0106b..d99ee9d8d74 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.12 2014/04/11 07:42:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2014/05/07 19:43:03 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.2.1
+DISTNAME=	ffmpeg-2.2.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index 427cf4114b4..9f97f330f69 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2014/04/11 07:42:30 adam Exp $
+$NetBSD: distinfo,v 1.11 2014/05/07 19:43:03 adam Exp $
 
-SHA1 (ffmpeg-2.2.1.tar.bz2) = c5f8d103b20cd73d329401d85ced4a014757f8b9
-RMD160 (ffmpeg-2.2.1.tar.bz2) = 4e6bd43ca558b10708375ad294e242dc654173af
-Size (ffmpeg-2.2.1.tar.bz2) = 7024592 bytes
+SHA1 (ffmpeg-2.2.2.tar.bz2) = 8a4f282ccb5efbec31a9747d12c8d7b07c481f2e
+RMD160 (ffmpeg-2.2.2.tar.bz2) = 4a533428ef48a751efb196ce412f5f2fb7ee49bf
+Size (ffmpeg-2.2.2.tar.bz2) = 7026587 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-configure) = 032f7386bf68240971d0d6a59e291d48f23acf32
-SHA1 (patch-libavcodec_libx265.c) = 121113876a1089f07b4dc65c26a0a552b0d25d0d
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
diff --git a/multimedia/ffmpeg2/patches/patch-libavcodec_libx265.c b/multimedia/ffmpeg2/patches/patch-libavcodec_libx265.c
deleted file mode 100644
index 5ec2d094f1a..00000000000
--- a/multimedia/ffmpeg2/patches/patch-libavcodec_libx265.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-libavcodec_libx265.c,v 1.1 2014/04/01 10:51:49 adam Exp $
-
-Fix building with newer x265.
-
---- libavcodec/libx265.c.orig	2014-03-25 13:51:11.000000000 +0000
-+++ libavcodec/libx265.c
-@@ -120,11 +121,11 @@ static av_cold int libx265_encode_init(A
-     av_reduce(&sar_num, &sar_den,
-               avctx->sample_aspect_ratio.num,
-               avctx->sample_aspect_ratio.den, 4096);
--    ctx->params->bEnableVuiParametersPresentFlag = 1;
--    ctx->params->bEnableAspectRatioIdc           = 1;
--    ctx->params->aspectRatioIdc                  = 255;
--    ctx->params->sarWidth                        = sar_num;
--    ctx->params->sarHeight                       = sar_den;
-+    ctx->params->vui.bEnableVuiParametersPresentFlag = 1;
-+    ctx->params->vui.bEnableAspectRatioIdc           = 1;
-+    ctx->params->vui.aspectRatioIdc                  = 255;
-+    ctx->params->vui.sarWidth                        = sar_num;
-+    ctx->params->vui.sarHeight                       = sar_den;
- 
-     if (x265_max_bit_depth == 8)
-         ctx->params->internalBitDepth = 8;
diff --git a/multimedia/ffplay2/Makefile b/multimedia/ffplay2/Makefile
index deea230ad0e..fe06429fae2 100644
--- a/multimedia/ffplay2/Makefile
+++ b/multimedia/ffplay2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2014/04/10 05:39:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/07 19:43:03 adam Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffplay2/}
-PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Simple SDL frontend for FFmpeg