- Update to new upstream snapshot as of 2015-04-03

  (included ffmpeg snapshot as of 2015-04-03)
- Fix vulnerabilities CVE-2014-8544 and CVE-2014-9604
  with bundled ffmpeg snapshot in the process

MFH:		2015Q2

7 files changed, 18 insertions, 20 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index c395388c092b..4a8f7560a176 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
 
 COMMENT=	Convenient video file and movie encoder
 
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 169eedb31e6f..9ae471439ae1 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909
-SIZE (mplayer-1.1.20141223.tar.xz) = 11408272
+SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3
+SIZE (mplayer-1.1.20150403.tar.xz) = 11552096
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 1e21b77708b6..fbaeef3c3bba 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
 
 COMMENT=	High performance media player supporting many formats
 
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index bb7062538fd7..d1c39856f53c 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 
-MPLAYER_SNAPSHOT_DATE=	2014-12-23
+MPLAYER_SNAPSHOT_DATE=	2015-04-03
 MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 169eedb31e6f..9ae471439ae1 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909
-SIZE (mplayer-1.1.20141223.tar.xz) = 11408272
+SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3
+SIZE (mplayer-1.1.20150403.tar.xz) = 11552096
diff --git a/multimedia/mplayer/files/patch-libavcodec-Makefile b/multimedia/mplayer/files/patch-libavcodec-Makefile
index 0681ab4dbe13..38df12736345 100644
--- a/multimedia/mplayer/files/patch-libavcodec-Makefile
+++ b/multimedia/mplayer/files/patch-libavcodec-Makefile
@@ -1,11 +1,11 @@
---- ffmpeg/libavcodec/Makefile.orig	2012-07-20 19:20:04.000000000 +0200
-+++ ffmpeg/libavcodec/Makefile	2012-07-21 18:25:12.582670118 +0200
-@@ -788,7 +788,7 @@
-                                           codec_names.h                 \
-                                           fft-internal.h                \
+--- ffmpeg/libavcodec/Makefile.orig	2015-04-02 19:20:07.000000000 +0200
++++ ffmpeg/libavcodec/Makefile	2015-04-03 13:25:18.741269686 +0200
+@@ -865,7 +865,7 @@
+                                           old_codec_ids.h               \
                                            tableprint.h                  \
+                                           tableprint_vlc.h              \
 -                                          $(ARCH)/vp56_arith.h          \
-+                                          $(MPLAYER_ARCH)/vp56_arith.h  \
++                                          $(MPLAYER_ARCH)/vp56_arith.h          \
  
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
diff --git a/multimedia/mplayer/files/patch-libavformat-udp.c b/multimedia/mplayer/files/patch-libavformat-udp.c
index 8efe47f4d638..1015e1c028e1 100644
--- a/multimedia/mplayer/files/patch-libavformat-udp.c
+++ b/multimedia/mplayer/files/patch-libavformat-udp.c
@@ -1,11 +1,11 @@
---- ffmpeg/libavformat/udp.c.orig	2011-03-16 13:49:21.000000000 +0100
-+++ ffmpeg/libavformat/udp.c	2011-03-18 17:18:12.884305376 +0100
-@@ -42,6 +42,8 @@
- #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
- #endif
+--- ffmpeg/libavformat/udp.c.orig	2015-03-30 19:20:06.000000000 +0200
++++ ffmpeg/libavformat/udp.c	2015-04-03 13:29:34.228251670 +0200
+@@ -71,6 +71,8 @@
+ #define UDP_MAX_PKT_SIZE 65536
+ #define UDP_HEADER_SIZE 8
  
 +#define IPPROTO_IPV6 41
 +
- typedef struct {
+ typedef struct UDPContext {
+     const AVClass *class;
      int udp_fd;
-     int ttl;