The FFmpeg Project proudly presents FFmpeg 2.3 "Mandelbrot", a major

release with all the great features committed during the three-month period
since the release of FFmpeg 2.2.

In this release, there are lots of internal overhauls that make FFmpeg a
more accessible project for new developers. Many important new
optimizations and features like QTKit and AVFoundation input devices are
committed. Contributions done by Libav such as a new native Opus decoder
are also merged.

Because of the increasing difficulty to maintain and lack of maintainers,
we are very sorry to say that we have removed all Blackfin and SPARC
architecture assembly optimizations with the cleanups done. If you are
interested in maintaining optimization for these two architecture, feel
free to contact us and we will restore the code!

Oh, and since this release, this modern-looking release note is provided in
addition to the old-style Changelog file, to make it easier for you to
focus on the most important features in this release.

Enjoy!

4 files changed, 32 insertions, 27 deletions

diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index ad1576dd884..b7edaf13cd6 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.16 2014/07/15 17:11:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2014/07/25 22:46:00 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.2.5
+DISTNAME=	ffmpeg-2.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/PLIST b/multimedia/ffmpeg2/PLIST
index d8db687edd5..dc1788371fe 100644
--- a/multimedia/ffmpeg2/PLIST
+++ b/multimedia/ffmpeg2/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2014/04/01 10:51:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/07/25 22:46:00 adam Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
 include/ffmpeg2/libavcodec/avcodec.h
 include/ffmpeg2/libavcodec/avfft.h
+include/ffmpeg2/libavcodec/dv_profile.h
 include/ffmpeg2/libavcodec/dxva2.h
 include/ffmpeg2/libavcodec/old_codec_ids.h
 include/ffmpeg2/libavcodec/vaapi.h
@@ -42,6 +43,7 @@ include/ffmpeg2/libavutil/common.h
 include/ffmpeg2/libavutil/cpu.h
 include/ffmpeg2/libavutil/crc.h
 include/ffmpeg2/libavutil/dict.h
+include/ffmpeg2/libavutil/display.h
 include/ffmpeg2/libavutil/downmix_info.h
 include/ffmpeg2/libavutil/error.h
 include/ffmpeg2/libavutil/eval.h
@@ -49,6 +51,7 @@ include/ffmpeg2/libavutil/ffversion.h
 include/ffmpeg2/libavutil/fifo.h
 include/ffmpeg2/libavutil/file.h
 include/ffmpeg2/libavutil/frame.h
+include/ffmpeg2/libavutil/hash.h
 include/ffmpeg2/libavutil/hmac.h
 include/ffmpeg2/libavutil/imgutils.h
 include/ffmpeg2/libavutil/intfloat.h
@@ -70,11 +73,13 @@ include/ffmpeg2/libavutil/pixdesc.h
 include/ffmpeg2/libavutil/pixfmt.h
 include/ffmpeg2/libavutil/random_seed.h
 include/ffmpeg2/libavutil/rational.h
+include/ffmpeg2/libavutil/replaygain.h
 include/ffmpeg2/libavutil/ripemd.h
 include/ffmpeg2/libavutil/samplefmt.h
 include/ffmpeg2/libavutil/sha.h
 include/ffmpeg2/libavutil/sha512.h
 include/ffmpeg2/libavutil/stereo3d.h
+include/ffmpeg2/libavutil/threadmessage.h
 include/ffmpeg2/libavutil/time.h
 include/ffmpeg2/libavutil/timecode.h
 include/ffmpeg2/libavutil/timestamp.h
@@ -89,23 +94,23 @@ include/ffmpeg2/libswscale/version.h
 lib/ffmpeg2/libavcodec.a
 lib/ffmpeg2/libavcodec.so
 lib/ffmpeg2/libavcodec.so.55
-lib/ffmpeg2/libavcodec.so.55.52.102
+lib/ffmpeg2/libavcodec.so.55.69.100
 lib/ffmpeg2/libavdevice.a
 lib/ffmpeg2/libavdevice.so
 lib/ffmpeg2/libavdevice.so.55
-lib/ffmpeg2/libavdevice.so.55.10.100
+lib/ffmpeg2/libavdevice.so.55.13.102
 lib/ffmpeg2/libavfilter.a
 lib/ffmpeg2/libavfilter.so
 lib/ffmpeg2/libavfilter.so.4
-lib/ffmpeg2/libavfilter.so.4.2.100
+lib/ffmpeg2/libavfilter.so.4.11.100
 lib/ffmpeg2/libavformat.a
 lib/ffmpeg2/libavformat.so
 lib/ffmpeg2/libavformat.so.55
-lib/ffmpeg2/libavformat.so.55.33.100
+lib/ffmpeg2/libavformat.so.55.48.100
 lib/ffmpeg2/libavutil.a
 lib/ffmpeg2/libavutil.so
 lib/ffmpeg2/libavutil.so.52
-lib/ffmpeg2/libavutil.so.52.66.100
+lib/ffmpeg2/libavutil.so.52.92.100
 lib/ffmpeg2/libpostproc.a
 lib/ffmpeg2/libpostproc.so
 lib/ffmpeg2/libpostproc.so.52
@@ -113,11 +118,11 @@ lib/ffmpeg2/libpostproc.so.52.3.100
 lib/ffmpeg2/libswresample.a
 lib/ffmpeg2/libswresample.so
 lib/ffmpeg2/libswresample.so.0
-lib/ffmpeg2/libswresample.so.0.18.100
+lib/ffmpeg2/libswresample.so.0.19.100
 lib/ffmpeg2/libswscale.a
 lib/ffmpeg2/libswscale.so
 lib/ffmpeg2/libswscale.so.2
-lib/ffmpeg2/libswscale.so.2.5.102
+lib/ffmpeg2/libswscale.so.2.6.100
 lib/ffmpeg2/pkgconfig/libavcodec.pc
 lib/ffmpeg2/pkgconfig/libavdevice.pc
 lib/ffmpeg2/pkgconfig/libavfilter.pc
@@ -139,11 +144,12 @@ share/doc/ffmpeg2/snow.txt
 share/doc/ffmpeg2/swresample.txt
 share/doc/ffmpeg2/swscale.txt
 share/doc/ffmpeg2/tablegen.txt
+share/doc/ffmpeg2/writing_filters.txt
 share/examples/ffmpeg2/ffserver.conf
 share/ffmpeg2/examples/Makefile
 share/ffmpeg2/examples/README
-share/ffmpeg2/examples/avcodec.c
 share/ffmpeg2/examples/avio_reading.c
+share/ffmpeg2/examples/decoding_encoding.c
 share/ffmpeg2/examples/demuxing_decoding.c
 share/ffmpeg2/examples/filter_audio.c
 share/ffmpeg2/examples/filtering_audio.c
@@ -154,11 +160,10 @@ share/ffmpeg2/examples/remuxing.c
 share/ffmpeg2/examples/resampling_audio.c
 share/ffmpeg2/examples/scaling_video.c
 share/ffmpeg2/examples/transcode_aac.c
+share/ffmpeg2/examples/transcoding.c
 share/ffmpeg2/ffprobe.xsd
 share/ffmpeg2/libvpx-1080p.ffpreset
 share/ffmpeg2/libvpx-1080p50_60.ffpreset
 share/ffmpeg2/libvpx-360p.ffpreset
 share/ffmpeg2/libvpx-720p.ffpreset
 share/ffmpeg2/libvpx-720p50_60.ffpreset
-share/ffmpeg2/libx264-ipod320.ffpreset
-share/ffmpeg2/libx264-ipod640.ffpreset
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index 121fa609686..b6958a358b8 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2014/07/15 17:11:44 adam Exp $
+$NetBSD: distinfo,v 1.15 2014/07/25 22:46:00 adam Exp $
 
-SHA1 (ffmpeg-2.2.5.tar.bz2) = ae13306dc9fa00fe77fd4e54d79e4ca4392fe36c
-RMD160 (ffmpeg-2.2.5.tar.bz2) = 2584ee7fa1f5dc3608e8edef9bd5f218e1797a41
-Size (ffmpeg-2.2.5.tar.bz2) = 7024774 bytes
+SHA1 (ffmpeg-2.3.tar.bz2) = 0006580ef3409aaace1c4c35ed6d77aa326ae17c
+RMD160 (ffmpeg-2.3.tar.bz2) = 8140c254d008cfc623ae42ffbda8e0f453b383c7
+Size (ffmpeg-2.3.tar.bz2) = 7443666 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
-SHA1 (patch-configure) = 032f7386bf68240971d0d6a59e291d48f23acf32
+SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
 SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
diff --git a/multimedia/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure
index 8ff7245beeb..8182b6f4fd3 100644
--- a/multimedia/ffmpeg2/patches/patch-configure
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.3 2014/04/01 10:51:49 adam Exp $
+$NetBSD: patch-configure,v 1.4 2014/07/25 22:46:00 adam Exp $
 
---- configure.orig	2014-03-23 22:08:02.000000000 +0000
+--- configure.orig	2014-07-16 01:00:37.000000000 +0000
 +++ configure
-@@ -3716,6 +3716,11 @@ case $target_os in
+@@ -3929,6 +3929,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.3 2014/04/01 10:51:49 adam Exp $
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -4101,10 +4106,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -4315,10 +4320,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -29,9 +29,9 @@ $NetBSD: patch-configure,v 1.3 2014/04/01 10:51:49 adam Exp $
  EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
- check_inline_asm inline_asm_labels '"1:\n"'
- 
-@@ -4727,6 +4735,7 @@ enabled xmm_clobber_test &&
+ if  [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] ;then
+     if ! enabled bigendian ;then
+@@ -4997,6 +5005,7 @@ enabled xmm_clobber_test &&
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.3 2014/04/01 10:51:49 adam Exp $
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -4739,6 +4748,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -5009,6 +5018,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.3 2014/04/01 10:51:49 adam Exp $
  
  if [ -z "$optflags" ]; then
      if enabled small; then
-@@ -5259,7 +5269,7 @@ Version: $version
+@@ -5596,7 +5606,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts: