ffmpeg: 2.3 -> 2.4.2 new dependency x265

3 files changed, 34 insertions, 30 deletions

diff --git a/ffmpeg/.footprint b/ffmpeg/.footprint
index e714f7e5f..f3cd19a3e 100644
--- a/ffmpeg/.footprint
+++ b/ffmpeg/.footprint
@@ -75,11 +75,13 @@ drwxr-xr-x	root/root	usr/include/libavutil/
 -rw-r--r--	root/root	usr/include/libavutil/mathematics.h
 -rw-r--r--	root/root	usr/include/libavutil/md5.h
 -rw-r--r--	root/root	usr/include/libavutil/mem.h
+-rw-r--r--	root/root	usr/include/libavutil/motion_vector.h
 -rw-r--r--	root/root	usr/include/libavutil/murmur3.h
 -rw-r--r--	root/root	usr/include/libavutil/old_pix_fmts.h
 -rw-r--r--	root/root	usr/include/libavutil/opt.h
 -rw-r--r--	root/root	usr/include/libavutil/parseutils.h
 -rw-r--r--	root/root	usr/include/libavutil/pixdesc.h
+-rw-r--r--	root/root	usr/include/libavutil/pixelutils.h
 -rw-r--r--	root/root	usr/include/libavutil/pixfmt.h
 -rw-r--r--	root/root	usr/include/libavutil/random_seed.h
 -rw-r--r--	root/root	usr/include/libavutil/rational.h
@@ -106,41 +108,41 @@ drwxr-xr-x	root/root	usr/include/libswscale/
 -rw-r--r--	root/root	usr/include/libswscale/version.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libavcodec.a
-lrwxrwxrwx	root/root	usr/lib/libavcodec.so -> libavcodec.so.55.69.100
-lrwxrwxrwx	root/root	usr/lib/libavcodec.so.55 -> libavcodec.so.55.69.100
--rwxr-xr-x	root/root	usr/lib/libavcodec.so.55.69.100
+lrwxrwxrwx	root/root	usr/lib/libavcodec.so -> libavcodec.so.56.1.100
+lrwxrwxrwx	root/root	usr/lib/libavcodec.so.56 -> libavcodec.so.56.1.100
+-rwxr-xr-x	root/root	usr/lib/libavcodec.so.56.1.100
 -rw-r--r--	root/root	usr/lib/libavdevice.a
-lrwxrwxrwx	root/root	usr/lib/libavdevice.so -> libavdevice.so.55.13.102
-lrwxrwxrwx	root/root	usr/lib/libavdevice.so.55 -> libavdevice.so.55.13.102
--rwxr-xr-x	root/root	usr/lib/libavdevice.so.55.13.102
+lrwxrwxrwx	root/root	usr/lib/libavdevice.so -> libavdevice.so.56.0.100
+lrwxrwxrwx	root/root	usr/lib/libavdevice.so.56 -> libavdevice.so.56.0.100
+-rwxr-xr-x	root/root	usr/lib/libavdevice.so.56.0.100
 -rw-r--r--	root/root	usr/lib/libavfilter.a
-lrwxrwxrwx	root/root	usr/lib/libavfilter.so -> libavfilter.so.4.11.100
-lrwxrwxrwx	root/root	usr/lib/libavfilter.so.4 -> libavfilter.so.4.11.100
--rwxr-xr-x	root/root	usr/lib/libavfilter.so.4.11.100
+lrwxrwxrwx	root/root	usr/lib/libavfilter.so -> libavfilter.so.5.1.100
+lrwxrwxrwx	root/root	usr/lib/libavfilter.so.5 -> libavfilter.so.5.1.100
+-rwxr-xr-x	root/root	usr/lib/libavfilter.so.5.1.100
 -rw-r--r--	root/root	usr/lib/libavformat.a
-lrwxrwxrwx	root/root	usr/lib/libavformat.so -> libavformat.so.55.48.100
-lrwxrwxrwx	root/root	usr/lib/libavformat.so.55 -> libavformat.so.55.48.100
--rwxr-xr-x	root/root	usr/lib/libavformat.so.55.48.100
+lrwxrwxrwx	root/root	usr/lib/libavformat.so -> libavformat.so.56.4.101
+lrwxrwxrwx	root/root	usr/lib/libavformat.so.56 -> libavformat.so.56.4.101
+-rwxr-xr-x	root/root	usr/lib/libavformat.so.56.4.101
 -rw-r--r--	root/root	usr/lib/libavresample.a
-lrwxrwxrwx	root/root	usr/lib/libavresample.so -> libavresample.so.1.3.0
-lrwxrwxrwx	root/root	usr/lib/libavresample.so.1 -> libavresample.so.1.3.0
--rwxr-xr-x	root/root	usr/lib/libavresample.so.1.3.0
+lrwxrwxrwx	root/root	usr/lib/libavresample.so -> libavresample.so.2.1.0
+lrwxrwxrwx	root/root	usr/lib/libavresample.so.2 -> libavresample.so.2.1.0
+-rwxr-xr-x	root/root	usr/lib/libavresample.so.2.1.0
 -rw-r--r--	root/root	usr/lib/libavutil.a
-lrwxrwxrwx	root/root	usr/lib/libavutil.so -> libavutil.so.52.92.100
-lrwxrwxrwx	root/root	usr/lib/libavutil.so.52 -> libavutil.so.52.92.100
--rwxr-xr-x	root/root	usr/lib/libavutil.so.52.92.100
+lrwxrwxrwx	root/root	usr/lib/libavutil.so -> libavutil.so.54.7.100
+lrwxrwxrwx	root/root	usr/lib/libavutil.so.54 -> libavutil.so.54.7.100
+-rwxr-xr-x	root/root	usr/lib/libavutil.so.54.7.100
 -rw-r--r--	root/root	usr/lib/libpostproc.a
-lrwxrwxrwx	root/root	usr/lib/libpostproc.so -> libpostproc.so.52.3.100
-lrwxrwxrwx	root/root	usr/lib/libpostproc.so.52 -> libpostproc.so.52.3.100
--rwxr-xr-x	root/root	usr/lib/libpostproc.so.52.3.100
+lrwxrwxrwx	root/root	usr/lib/libpostproc.so -> libpostproc.so.53.0.100
+lrwxrwxrwx	root/root	usr/lib/libpostproc.so.53 -> libpostproc.so.53.0.100
+-rwxr-xr-x	root/root	usr/lib/libpostproc.so.53.0.100
 -rw-r--r--	root/root	usr/lib/libswresample.a
-lrwxrwxrwx	root/root	usr/lib/libswresample.so -> libswresample.so.0.19.100
-lrwxrwxrwx	root/root	usr/lib/libswresample.so.0 -> libswresample.so.0.19.100
--rwxr-xr-x	root/root	usr/lib/libswresample.so.0.19.100
+lrwxrwxrwx	root/root	usr/lib/libswresample.so -> libswresample.so.1.1.100
+lrwxrwxrwx	root/root	usr/lib/libswresample.so.1 -> libswresample.so.1.1.100
+-rwxr-xr-x	root/root	usr/lib/libswresample.so.1.1.100
 -rw-r--r--	root/root	usr/lib/libswscale.a
-lrwxrwxrwx	root/root	usr/lib/libswscale.so -> libswscale.so.2.6.100
-lrwxrwxrwx	root/root	usr/lib/libswscale.so.2 -> libswscale.so.2.6.100
--rwxr-xr-x	root/root	usr/lib/libswscale.so.2.6.100
+lrwxrwxrwx	root/root	usr/lib/libswscale.so -> libswscale.so.3.0.100
+lrwxrwxrwx	root/root	usr/lib/libswscale.so.3 -> libswscale.so.3.0.100
+-rwxr-xr-x	root/root	usr/lib/libswscale.so.3.0.100
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libavcodec.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libavdevice.pc
@@ -186,6 +188,7 @@ drwxr-xr-x	root/root	usr/share/ffmpeg/examples/
 -rw-r--r--	root/root	usr/share/ffmpeg/examples/avio_reading.c
 -rw-r--r--	root/root	usr/share/ffmpeg/examples/decoding_encoding.c
 -rw-r--r--	root/root	usr/share/ffmpeg/examples/demuxing_decoding.c
+-rw-r--r--	root/root	usr/share/ffmpeg/examples/extract_mvs.c
 -rw-r--r--	root/root	usr/share/ffmpeg/examples/filter_audio.c
 -rw-r--r--	root/root	usr/share/ffmpeg/examples/filtering_audio.c
 -rw-r--r--	root/root	usr/share/ffmpeg/examples/filtering_video.c
diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum
index 27f2c0dad..70b1f16f4 100644
--- a/ffmpeg/.md5sum
+++ b/ffmpeg/.md5sum
@@ -1 +1 @@
-00f98a030d21366b6583875d57d98c27  ffmpeg-2.3.tar.bz2
+9e6163b09b7b9331b834d80874c2c0ff  ffmpeg-2.4.2.tar.bz2
diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile
index c2cac5487..7c61fe0b0 100644
--- a/ffmpeg/Pkgfile
+++ b/ffmpeg/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://ffmpeg.org/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Matt Housh, jaeger at crux dot nu
-# Depends on: gnutls imlib2 lame libass libbluray libmodplug libsdl libtheora libva libvdpau libxvid opencore-amr opus rtmpdump schroedinger speex x264 openjpeg libvpx
+# Depends on: gnutls imlib2 lame libass libbluray libmodplug libsdl libtheora libva libvdpau libxvid opencore-amr opus rtmpdump schroedinger speex x264 x265 openjpeg libvpx
 
 name=ffmpeg
-version=2.3
+version=2.4.2
 release=1
 source=(http://ffmpeg.org/releases/$name-$version.tar.bz2)
 
@@ -38,6 +38,7 @@ build() {
 		--enable-libtheora \
 		--enable-libvorbis \
 		--enable-libx264 \
+		--enable-libx265 \
 		--enable-libvpx \
 		--enable-libxvid \
 		--enable-pic \