svn commit: r394628 - in branches/2015Q3/multimedia/vlc: . files
Xin LI
delphij at FreeBSD.org
Tue Aug 18 17:46:33 UTC 2015
Author: delphij
Date: Tue Aug 18 17:46:32 2015
New Revision: 394628
URL: https://svnweb.freebsd.org/changeset/ports/394628
Log:
MFH: r394625
Apply vendor changeset ce91452:
demux: mp4: correctly match release function
Obtained from: VLC
Approved by: ports-secteam
Added:
branches/2015Q3/multimedia/vlc/files/patch-vendor-00-ce91452
- copied unchanged from r394625, head/multimedia/vlc/files/patch-vendor-00-ce91452
Modified:
branches/2015Q3/multimedia/vlc/Makefile
Directory Properties:
branches/2015Q3/ (props changed)
Modified: branches/2015Q3/multimedia/vlc/Makefile
==============================================================================
--- branches/2015Q3/multimedia/vlc/Makefile Tue Aug 18 17:45:45 2015 (r394627)
+++ branches/2015Q3/multimedia/vlc/Makefile Tue Aug 18 17:46:32 2015 (r394628)
@@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.2.1
-PORTREVISION= 1
+PORTREVISION= 5
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
Copied: branches/2015Q3/multimedia/vlc/files/patch-vendor-00-ce91452 (from r394625, head/multimedia/vlc/files/patch-vendor-00-ce91452)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q3/multimedia/vlc/files/patch-vendor-00-ce91452 Tue Aug 18 17:46:32 2015 (r394628, copy of r394625, head/multimedia/vlc/files/patch-vendor-00-ce91452)
@@ -0,0 +1,29 @@
+From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcartegnie at free.fr>
+Date: Mon, 3 Aug 2015 15:17:32 +0200
+Subject: [PATCH] demux: mp4: correctly match release function
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/demux/mp4/libmp4.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git modules/demux/mp4/libmp4.c modules/demux/mp4/libmp4.c
+index 331262b..f220e51 100644
+--- modules/demux/mp4/libmp4.c
++++ modules/demux/mp4/libmp4.c
+@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
+ {
+ for( i_index = 0; ; i_index++ )
+ {
++ if ( MP4_Box_Function[i_index].i_parent &&
++ p_box->p_father &&
++ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
++ continue;
++
+ if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
+ ( MP4_Box_Function[i_index].i_type == 0 ) )
+ {
+--
+1.7.10.4
+
More information about the svn-ports-branches
mailing list