Update to 2.4.1:

The FFmpeg Project proudly presents FFmpeg 2.4 "Fresnel", just 2 months
after the release of 2.3. Since this wasn't a long time ago, the Changelog
is a bit short this time.

The most important thing in this release is the major version bump of the
libraries.  This means that this release is neither ABI-compatible nor
fully API-compatible. But on the other hand it is aligned with the Libav
11 release series, and will as a result probably end up being maintained for
a long time.

Important API changes since 2.3:

• The new field mime_type was added to AVProbeData, which can
  cause crashes, if it is not initialized.
• Some deprecated functions were removed.
• The avfilter_graph_parse function was made compatible with Libav.
• The Matroska demuxer now outputs verbatim ASS packets.

Please refer to the doc/APIchanges file for more information.

libavformat

• Icecast protocol.
• API for live metadata updates through event flags.
• UTF-16 support in text subtitles formats.
• The ASS muxer now reorders the Dialogue events properly.
• support for H.261 RTP payload format (RFC 4587)
• HEVC/H.265 RTP payload format (draft v6) depacketizer

libavfilter

• Ported lenscorrection filter from frei0r filter.
• Large optimizations in dctdnoiz to make it usable.
• Added codecview filter to visualize information exported by some codecs.
• Added silenceremove filter.

libavutil

• Added clip() function in eval.

Behaviour changes

• dctdnoiz filter now uses a block size of 8x8 instead of 16x16 by default
• -vismv option is deprecated in favor of the codecview filter
• libmodplug is now detected through pkg-config
• HTML documentation generation through texi2html is deprecated in
  favor of makeinfo/texi2any
• ICY metadata are now requested by default with the HTTP protocol

5 files changed, 29 insertions, 27 deletions

diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index d26226700c5..c9246f70149 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/08/30 11:21:19 richard Exp $
+# $NetBSD: Makefile,v 1.12 2014/10/01 16:09:16 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg2/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v2.x)
-PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--enable-avfilter
 #CONFIGURE_ARGS+=	--enable-avfilter-lavf
diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index bd0684c32fe..0a7ad90a134 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.21 2014/08/30 11:21:19 richard Exp $
+# $NetBSD: Makefile.common,v 1.22 2014/10/01 16:09:16 wiz Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.3.3
+DISTNAME=	ffmpeg-2.4.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/PLIST b/multimedia/ffmpeg2/PLIST
index dc1788371fe..edca34be894 100644
--- a/multimedia/ffmpeg2/PLIST
+++ b/multimedia/ffmpeg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/07/25 22:46:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/10/01 16:09:16 wiz Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
@@ -64,12 +64,14 @@ include/ffmpeg2/libavutil/macros.h
 include/ffmpeg2/libavutil/mathematics.h
 include/ffmpeg2/libavutil/md5.h
 include/ffmpeg2/libavutil/mem.h
+include/ffmpeg2/libavutil/motion_vector.h
 include/ffmpeg2/libavutil/murmur3.h
 include/ffmpeg2/libavutil/old_pix_fmts.h
 ${PLIST.opencl}include/ffmpeg2/libavutil/opencl.h
 include/ffmpeg2/libavutil/opt.h
 include/ffmpeg2/libavutil/parseutils.h
 include/ffmpeg2/libavutil/pixdesc.h
+include/ffmpeg2/libavutil/pixelutils.h
 include/ffmpeg2/libavutil/pixfmt.h
 include/ffmpeg2/libavutil/random_seed.h
 include/ffmpeg2/libavutil/rational.h
@@ -93,36 +95,36 @@ include/ffmpeg2/libswscale/swscale.h
 include/ffmpeg2/libswscale/version.h
 lib/ffmpeg2/libavcodec.a
 lib/ffmpeg2/libavcodec.so
-lib/ffmpeg2/libavcodec.so.55
-lib/ffmpeg2/libavcodec.so.55.69.100
+lib/ffmpeg2/libavcodec.so.56
+lib/ffmpeg2/libavcodec.so.56.1.100
 lib/ffmpeg2/libavdevice.a
 lib/ffmpeg2/libavdevice.so
-lib/ffmpeg2/libavdevice.so.55
-lib/ffmpeg2/libavdevice.so.55.13.102
+lib/ffmpeg2/libavdevice.so.56
+lib/ffmpeg2/libavdevice.so.56.0.100
 lib/ffmpeg2/libavfilter.a
 lib/ffmpeg2/libavfilter.so
-lib/ffmpeg2/libavfilter.so.4
-lib/ffmpeg2/libavfilter.so.4.11.100
+lib/ffmpeg2/libavfilter.so.5
+lib/ffmpeg2/libavfilter.so.5.1.100
 lib/ffmpeg2/libavformat.a
 lib/ffmpeg2/libavformat.so
-lib/ffmpeg2/libavformat.so.55
-lib/ffmpeg2/libavformat.so.55.48.100
+lib/ffmpeg2/libavformat.so.56
+lib/ffmpeg2/libavformat.so.56.4.101
 lib/ffmpeg2/libavutil.a
 lib/ffmpeg2/libavutil.so
-lib/ffmpeg2/libavutil.so.52
-lib/ffmpeg2/libavutil.so.52.92.100
+lib/ffmpeg2/libavutil.so.54
+lib/ffmpeg2/libavutil.so.54.7.100
 lib/ffmpeg2/libpostproc.a
 lib/ffmpeg2/libpostproc.so
-lib/ffmpeg2/libpostproc.so.52
-lib/ffmpeg2/libpostproc.so.52.3.100
+lib/ffmpeg2/libpostproc.so.53
+lib/ffmpeg2/libpostproc.so.53.0.100
 lib/ffmpeg2/libswresample.a
 lib/ffmpeg2/libswresample.so
-lib/ffmpeg2/libswresample.so.0
-lib/ffmpeg2/libswresample.so.0.19.100
+lib/ffmpeg2/libswresample.so.1
+lib/ffmpeg2/libswresample.so.1.1.100
 lib/ffmpeg2/libswscale.a
 lib/ffmpeg2/libswscale.so
-lib/ffmpeg2/libswscale.so.2
-lib/ffmpeg2/libswscale.so.2.6.100
+lib/ffmpeg2/libswscale.so.3
+lib/ffmpeg2/libswscale.so.3.0.100
 lib/ffmpeg2/pkgconfig/libavcodec.pc
 lib/ffmpeg2/pkgconfig/libavdevice.pc
 lib/ffmpeg2/pkgconfig/libavfilter.pc
@@ -151,6 +153,7 @@ share/ffmpeg2/examples/README
 share/ffmpeg2/examples/avio_reading.c
 share/ffmpeg2/examples/decoding_encoding.c
 share/ffmpeg2/examples/demuxing_decoding.c
+share/ffmpeg2/examples/extract_mvs.c
 share/ffmpeg2/examples/filter_audio.c
 share/ffmpeg2/examples/filtering_audio.c
 share/ffmpeg2/examples/filtering_video.c
diff --git a/multimedia/ffmpeg2/buildlink3.mk b/multimedia/ffmpeg2/buildlink3.mk
index 91c3c0d6fd9..ab2039540aa 100644
--- a/multimedia/ffmpeg2/buildlink3.mk
+++ b/multimedia/ffmpeg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/04/10 05:39:14 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/10/01 16:09:16 wiz Exp $
 
 BUILDLINK_TREE+=	ffmpeg2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ffmpeg2
 FFMPEG2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ffmpeg2+=	ffmpeg2>=2.0
-BUILDLINK_ABI_DEPENDS.ffmpeg2+=	ffmpeg2>=2.2nb1
+BUILDLINK_ABI_DEPENDS.ffmpeg2+=	ffmpeg2>=2.4.1
 BUILDLINK_PKGSRCDIR.ffmpeg2?=	../../multimedia/ffmpeg2
 
 pkgbase := ffmpeg2
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index 3764be81dd5..c43a2ff3a97 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2014/08/30 11:21:19 richard Exp $
+$NetBSD: distinfo,v 1.20 2014/10/01 16:09:16 wiz Exp $
 
-SHA1 (ffmpeg-2.3.3.tar.bz2) = 012afcbc57ecdf23f71b9901087cd5dbc8056756
-RMD160 (ffmpeg-2.3.3.tar.bz2) = cee0f67250da8e5dd11e58321b0466dcdfd33073
-Size (ffmpeg-2.3.3.tar.bz2) = 7448421 bytes
+SHA1 (ffmpeg-2.4.1.tar.bz2) = 8cb1c03af61001edbd0d9643b2a01b7aa097a4b3
+RMD160 (ffmpeg-2.4.1.tar.bz2) = 9a88e2ec407c8696dbd4aeba309e68c948f60f22
+Size (ffmpeg-2.4.1.tar.bz2) = 7367864 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e