Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLCKit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
72
Issues
72
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLCKit
Commits
76504d9e
Commit
76504d9e
authored
Nov 02, 2017
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVK: update libvlc
parent
78bdcac3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
11 deletions
+27
-11
Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch
...atches/0013-build-rename-exported-symbols-by-module.patch
+26
-10
buildMobileVLCKit.sh
buildMobileVLCKit.sh
+1
-1
No files found.
Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch
View file @
76504d9e
From
bd286c30447867086bbeed1f988f73d6b4269da0
Mon Sep 17 00:00:00 2001
From
78de355e24edb893c6614bbde04d9ffb958260fc
Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 11 Apr 2017 15:15:26 +0200
Date: Tue, 11 Apr 2017 15:15:26 +0200
Subject: [PATCH 13/15] build: rename exported symbols by module
Subject: [PATCH 13/15] build: rename exported symbols by module
...
@@ -9,12 +9,12 @@ This is quite ugly and temporary. Ideally we should rename symbols in binaries l
...
@@ -9,12 +9,12 @@ This is quite ugly and temporary. Ideally we should rename symbols in binaries l
modules/codec/ttml/ttml.h | 4 ++--
modules/codec/ttml/ttml.h | 4 ++--
modules/demux/avformat/avformat.c | 4 ++--
modules/demux/avformat/avformat.c | 4 ++--
modules/demux/avformat/avformat.h | 8 ++++----
modules/demux/avformat/avformat.h | 8 ++++----
modules/demux/avformat/demux.c | 1
2 ++++++
------
modules/demux/avformat/demux.c | 1
6 ++++++++--
------
modules/demux/avformat/mux.c | 4 ++--
modules/demux/avformat/mux.c | 4 ++--
modules/demux/ttml.c | 6 +++---
modules/demux/ttml.c | 6 +++---
modules/video_filter/deinterlace/deinterlace.c | 10 +++++-----
modules/video_filter/deinterlace/deinterlace.c | 10 +++++-----
modules/video_filter/deinterlace/deinterlace.h | 18 +++++++++---------
modules/video_filter/deinterlace/deinterlace.h | 18 +++++++++---------
9 files changed, 3
4 insertions(+), 34
deletions(-)
9 files changed, 3
6 insertions(+), 36
deletions(-)
diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
index 24b1050d5a..9b0abbbf26 100644
index 24b1050d5a..9b0abbbf26 100644
...
@@ -88,10 +88,10 @@ index 5105dd1efd..7c97fc842a 100644
...
@@ -88,10 +88,10 @@ index 5105dd1efd..7c97fc842a 100644
#define MUX_TEXT N_("Avformat mux")
#define MUX_TEXT N_("Avformat mux")
#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index
e99a9aa750..ac50c4b0d8
100644
index
2f3b907410..7c1a1a5319
100644
--- a/modules/demux/avformat/demux.c
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -14
3,7 +143
,7 @@
static void get_rotation(es_format_t *fmt, AVStream *s)
@@ -14
8,7 +148
,7 @@
static void get_rotation(es_format_t *fmt, AVStream *s)
}
}
}
}
...
@@ -100,7 +100,7 @@ index e99a9aa750..ac50c4b0d8 100644
...
@@ -100,7 +100,7 @@ index e99a9aa750..ac50c4b0d8 100644
{
{
demux_t *p_demux = (demux_t*)p_this;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
demux_sys_t *p_sys;
@@ -28
0,7 +280
,7 @@
int OpenDemux( vlc_object_t *p_this )
@@ -28
8,7 +288
,7 @@
int OpenDemux( vlc_object_t *p_this )
if( !p_io_buffer )
if( !p_io_buffer )
{
{
free( psz_url );
free( psz_url );
...
@@ -109,7 +109,7 @@ index e99a9aa750..ac50c4b0d8 100644
...
@@ -109,7 +109,7 @@ index e99a9aa750..ac50c4b0d8 100644
return VLC_ENOMEM;
return VLC_ENOMEM;
}
}
@@ -2
89,7 +289
,7 @@
int OpenDemux( vlc_object_t *p_this )
@@ -2
97,7 +297
,7 @@
int OpenDemux( vlc_object_t *p_this )
{
{
av_free( p_io_buffer );
av_free( p_io_buffer );
free( psz_url );
free( psz_url );
...
@@ -118,7 +118,7 @@ index e99a9aa750..ac50c4b0d8 100644
...
@@ -118,7 +118,7 @@ index e99a9aa750..ac50c4b0d8 100644
return VLC_ENOMEM;
return VLC_ENOMEM;
}
}
@@ -
299,7 +299
,7 @@
int OpenDemux( vlc_object_t *p_this )
@@ -
307,7 +307
,7 @@
int OpenDemux( vlc_object_t *p_this )
{
{
av_free( p_io_buffer );
av_free( p_io_buffer );
free( psz_url );
free( psz_url );
...
@@ -127,7 +127,7 @@ index e99a9aa750..ac50c4b0d8 100644
...
@@ -127,7 +127,7 @@ index e99a9aa750..ac50c4b0d8 100644
return VLC_ENOMEM;
return VLC_ENOMEM;
}
}
@@ -3
14,7 +314
,7 @@
int OpenDemux( vlc_object_t *p_this )
@@ -3
22,7 +322
,7 @@
int OpenDemux( vlc_object_t *p_this )
av_free( pb );
av_free( pb );
p_sys->ic = NULL;
p_sys->ic = NULL;
free( psz_url );
free( psz_url );
...
@@ -136,7 +136,23 @@ index e99a9aa750..ac50c4b0d8 100644
...
@@ -136,7 +136,23 @@ index e99a9aa750..ac50c4b0d8 100644
return VLC_EGENERIC;
return VLC_EGENERIC;
}
}
free( psz_url );
free( psz_url );
@@ -672,7 +672,7 @@
int OpenDemux( vlc_object_t *p_this )
@@ -357,13 +357,13 @@
int OpenDemux( vlc_object_t *p_this )
if( !nb_streams )
{
msg_Err( p_demux, "No streams found");
- CloseDemux( p_this );
+ CloseDemux__avformat( p_this );
return VLC_EGENERIC;
}
p_sys->tracks = calloc( nb_streams, sizeof(*p_sys->tracks) );
if( !p_sys->tracks )
{
- CloseDemux( p_this );
+ CloseDemux__avformat( p_this );
return VLC_ENOMEM;
}
@@ -690,7 +690,7 @@
int OpenDemux( vlc_object_t *p_this )
/*****************************************************************************
/*****************************************************************************
* Close
* Close
*****************************************************************************/
*****************************************************************************/
...
...
buildMobileVLCKit.sh
View file @
76504d9e
...
@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
...
@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR
=
empty
ROOT_DIR
=
empty
FARCH
=
"all"
FARCH
=
"all"
TESTEDHASH
=
3767a33c
TESTEDHASH
=
5430ac1
if
[
-z
"
$MAKE_JOBS
"
]
;
then
if
[
-z
"
$MAKE_JOBS
"
]
;
then
CORE_COUNT
=
`
sysctl
-n
machdep.cpu.core_count
`
CORE_COUNT
=
`
sysctl
-n
machdep.cpu.core_count
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment