mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Apply vendor changeset ce91452:

Browse Source 
demux: mp4: correctly match release function

Obtained from:	VLC
MFH:		2015Q3
This commit is contained in:
Xin LI 2015-08-18 17:41:32 +00:00
parent 11d7a25e6f
commit 9f78fad961
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=394625
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multimedia/vlc/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.2.1
PORTREVISION= 4
PORTREVISION= 5
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

29
multimedia/vlc/files/patch-vendor-00-ce91452 Normal file
View File

@ -0,0 +1,29 @@
From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcartegnie@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@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