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
3
Merge Requests
3
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
89e531e1
Commit
89e531e1
authored
Nov 12, 2017
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVK: update libvlc and remove unneeded patch
parent
565d5efe
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
33 additions
and
372 deletions
+33
-372
Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
...rm_neon-added-function-macro-to-handle-the-undersco.patch
+2
-2
Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
...einterlace-merge-use-a-macro-to-fix-compilation-for.patch
+2
-2
Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch
...Kit/patches/0003-arm_neon-work-around-libtool-issue.patch
+2
-2
Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch
.../MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch
+2
-2
Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch
...obileVLCKit/patches/0005-disable-neon-volume-plugin.patch
+2
-2
Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch
Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch
+2
-2
Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
...0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
+2
-2
Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch
...VLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch
+3
-3
Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch
...VLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch
+4
-4
Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch
...010-contrib-gcrypt-work-around-a-libtool-limitation.patch
+2
-2
Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch
...it/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch
+2
-2
Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch
...leVLCKit/patches/0012-contrib-gcrypt-update-patches.patch
+2
-2
Resources/MobileVLCKit/patches/0013-Replace-thread-local-with-pthread-TSD.patch
.../patches/0013-Replace-thread-local-with-pthread-TSD.patch
+3
-3
Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch
...atches/0013-build-rename-exported-symbols-by-module.patch
+0
-339
Resources/MobileVLCKit/patches/0014-contrib-use-live555-version-that-is-compatible-with-.patch
...ontrib-use-live555-version-that-is-compatible-with-.patch
+2
-2
buildMobileVLCKit.sh
buildMobileVLCKit.sh
+1
-1
No files found.
Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
View file @
89e531e1
From
668dc94771938e10e81d403b171774cb58d55c86
Mon Sep 17 00:00:00 2001
From
20f03288daaeb9aaccd26df4fa27cc043e00781e
Mon Sep 17 00:00:00 2001
From: David Geldreich <david.geldreich@free.fr>
Date: Fri, 20 Apr 2012 16:41:19 +0200
Subject: [PATCH 01/1
5
] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/1
4
] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
...
...
Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
View file @
89e531e1
From
f1a8fd5633d481c826b9333cd242b9dcb0dd874
4 Mon Sep 17 00:00:00 2001
From
c4dd9c8e35c14e0eaa7693d57d5a10961f704cb
4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 10 Aug 2012 16:02:07 +0200
Subject: [PATCH 02/1
5
] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/1
4
] deinterlace/merge: use a macro to fix compilation for
iOS
---
...
...
Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch
View file @
89e531e1
From
6d31c618f3fbf3b69e3794462b69e3e3bc2fe772
Mon Sep 17 00:00:00 2001
From
23ff0b45f02d9f7d4eab098b20cd34725bb255d3
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 03/1
5
] arm_neon: work-around libtool issue
Subject: [PATCH 03/1
4
] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
...
...
Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch
View file @
89e531e1
From
ad1469ad125d3730fe017e90d2d35fcdd0976de5
Mon Sep 17 00:00:00 2001
From
51dedcd012f6db2b237aa162cc939bee8bc3ec7f
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 04/1
5
] arm_neon: fix iOS linking
Subject: [PATCH 04/1
4
] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
...
...
Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch
View file @
89e531e1
From
376eaa77acbe6e82e528b693d60d93aea8b040e8
Mon Sep 17 00:00:00 2001
From
47404b0be6e9dd1a81a0a5f039680a68a7ef4b8b
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/1
5
] disable neon volume plugin
Subject: [PATCH 05/1
4
] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
...
...
Resources/MobileVLCKit/patches/0006-Enable-System-DL.patch
View file @
89e531e1
From
c5d0ba9169d60ec8ce2dcc46d17ec8830a84af95
Mon Sep 17 00:00:00 2001
From
65934a43e53b3888ed378ee796db04cc223252f3
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 06/1
5
] Enable System DL
Subject: [PATCH 06/1
4
] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
...
...
Resources/MobileVLCKit/patches/0007-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
View file @
89e531e1
From
78de05ed1914bc1908c73e6fcc3e1657153006fa
Mon Sep 17 00:00:00 2001
From
e6c689d3704187b16fa0de013ad782208263b285
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:04:05 +0200
Subject: [PATCH 07/1
5
] deinterlace-merge-arm64: fix linking on appleOS
Subject: [PATCH 07/1
4
] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
...
...
Resources/MobileVLCKit/patches/0008-http-add-vlc_http_cookies_clear.patch
View file @
89e531e1
From
355cea0bf383e528886c6d3ca4de1c39547281d1
Mon Sep 17 00:00:00 2001
From
71c676ecb8e0fe7b9b55c4236437f937b0255bdf
Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 08/1
5
] http: add vlc_http_cookies_clear
Subject: [PATCH 08/1
4
] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
...
...
@@ -23,7 +23,7 @@ index ed7e1613da..da1fe4ef1a 100644
/**
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index
5b1a8bfee8..39e8b59cc7
100644
index
7c99021ae4..250f14da5a
100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -128,6 +128,7 @@
vlc_http_auth_ParseAuthenticationInfoHeader
...
...
Resources/MobileVLCKit/patches/0009-libvlc_media-add-cookie_jar-API.patch
View file @
89e531e1
From
e029a25646d1f456f59ea93836dd17af47aab099
Mon Sep 17 00:00:00 2001
From
72eab0c02e1ba0737fbf59407163d7e1a7242f27
Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 09/1
5
] libvlc_media: add cookie_jar API
Subject: [PATCH 09/1
4
] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
...
...
@@ -71,7 +71,7 @@ index caa55981bf..c0d5754abf 100644
libvlc_playlist_play
libvlc_release
diff --git a/lib/media.c b/lib/media.c
index
8da5a130e2..167b3d733d
100644
index
af246c6c7e..4004dbc1eb
100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -406,6 +406,7 @@
libvlc_media_t * libvlc_media_new_from_input_item(
...
...
@@ -138,7 +138,7 @@ index 5a67e9ff60..0f0341e260 100644
/* Media Descriptor */
diff --git a/lib/media_player.c b/lib/media_player.c
index
ef34125aa5..b0d8c65c93
100644
index
daef2faedd..4a6cf0cb0e
100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -620,6 +620,7 @@
libvlc_media_player_new( libvlc_instance_t *instance )
...
...
Resources/MobileVLCKit/patches/0010-contrib-gcrypt-work-around-a-libtool-limitation.patch
View file @
89e531e1
From
47bc822d8f213e1bb1a632ea3bf1536b45e1fc92
Mon Sep 17 00:00:00 2001
From
81da678c195a38fedcc96b5f65aa1fb64bf71b5a
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 10/1
5
] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 10/1
4
] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
...
...
Resources/MobileVLCKit/patches/0011-contrib-gcrypt-fix-tvOS-compilation.patch
View file @
89e531e1
From
2cf678883254de618a1b6cb89619f70bc3d89639
Mon Sep 17 00:00:00 2001
From
34e3780d470e77c5d565986a29189be2f82c074e
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 11/1
5
] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 11/1
4
] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
...
...
Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch
View file @
89e531e1
From
39412b3ad9228f1cefa846ed451951c1a99d488b
Mon Sep 17 00:00:00 2001
From
f1231a5dd27935b6439248f294ca3f82b3aaf8a0
Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:03:37 +0200
Subject: [PATCH 12/1
5
] contrib/gcrypt: update patches
Subject: [PATCH 12/1
4
] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
...
...
Resources/MobileVLCKit/patches/001
4
-Replace-thread-local-with-pthread-TSD.patch
→
Resources/MobileVLCKit/patches/001
3
-Replace-thread-local-with-pthread-TSD.patch
View file @
89e531e1
From
75592fe271e36b6a21c818d3bf29052bcad8091d
Mon Sep 17 00:00:00 2001
From
d8fc810f8cbf17c8689396392580372dd96f008b
Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 1
4/15
] Replace thread local with pthread TSD
Subject: [PATCH 1
3/14
] Replace thread local with pthread TSD
---
src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
...
...
@@ -9,7 +9,7 @@ Subject: [PATCH 14/15] Replace thread local with pthread TSD
2 files changed, 78 insertions(+)
diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
index
3fafaa4183..476d9cfba5
100644
index
7004ed2c3a..65607cdcd3
100644
--- a/src/misc/interrupt.c
+++ b/src/misc/interrupt.c
@@ -43,13 +43,26 @@
...
...
Resources/MobileVLCKit/patches/0013-build-rename-exported-symbols-by-module.patch
deleted
100644 → 0
View file @
565d5efe
From 78de355e24edb893c6614bbde04d9ffb958260fc Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 11 Apr 2017 15:15:26 +0200
Subject: [PATCH 13/15] build: rename exported symbols by module
This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
---
modules/codec/ttml/ttml.c | 2 +-
modules/codec/ttml/ttml.h | 4 ++--
modules/demux/avformat/avformat.c | 4 ++--
modules/demux/avformat/avformat.h | 8 ++++----
modules/demux/avformat/demux.c | 16 ++++++++--------
modules/demux/avformat/mux.c | 4 ++--
modules/demux/ttml.c | 6 +++---
modules/video_filter/deinterlace/deinterlace.c | 10 +++++-----
modules/video_filter/deinterlace/deinterlace.h | 18 +++++++++---------
9 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
index 24b1050d5a..9b0abbbf26 100644
--- a/modules/codec/ttml/ttml.c
+++ b/modules/codec/ttml/ttml.c
@@ -54,7 +54,7 @@
vlc_module_begin ()
set_capability( "demux", 3 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
- set_callbacks( OpenDemux, CloseDemux )
+ set_callbacks( OpenDemux__ttml, CloseDemux__ttml )
add_shortcut( "ttml" )
vlc_module_end ()
diff --git a/modules/codec/ttml/ttml.h b/modules/codec/ttml/ttml.h
index 51f41126f9..5781a92a34 100644
--- a/modules/codec/ttml/ttml.h
+++ b/modules/codec/ttml/ttml.h
@@ -18,8 +18,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-int OpenDemux( vlc_object_t* p_this );
-void CloseDemux( demux_t* p_demux );
+int OpenDemux__ttml( vlc_object_t* p_this );
+void CloseDemux__ttml( demux_t* p_demux );
int OpenDecoder ( vlc_object_t * );
void CloseDecoder ( vlc_object_t * );
diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index 28c5a7df76..29cd5b144f 100644
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -41,7 +41,7 @@
vlc_module_begin ()
set_description( N_("Avformat demuxer" ) )
set_shortname( N_("Avformat") )
set_capability( "demux", 2 )
- set_callbacks( OpenDemux, CloseDemux )
+ set_callbacks( OpenDemux__avformat, CloseDemux__avformat )
set_section( N_("Demuxer"), NULL )
add_string( "avformat-format", NULL, FORMAT_TEXT, FORMAT_LONGTEXT, true )
add_obsolete_string("ffmpeg-format") /* removed since 2.1.0 */
@@ -57,7 +57,7 @@
vlc_module_begin ()
add_string( "sout-avformat-mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
add_obsolete_string("ffmpeg-mux") /* removed since 2.1.0 */
add_string( "sout-avformat-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
- set_callbacks( OpenMux, CloseMux )
+ set_callbacks( OpenMux__avformat, CloseMux__avformat )
#endif
#ifndef MERGE_FFMPEG
vlc_module_end ()
diff --git a/modules/demux/avformat/avformat.h b/modules/demux/avformat/avformat.h
index 5105dd1efd..7c97fc842a 100644
--- a/modules/demux/avformat/avformat.h
+++ b/modules/demux/avformat/avformat.h
@@ -25,12 +25,12 @@
void LibavcodecCallback( void *p_opaque, int i_level,
const char *psz_format, va_list va );
/* Demux module */
-int OpenDemux ( vlc_object_t * );
-void CloseDemux( vlc_object_t * );
+int OpenDemux__avformat ( vlc_object_t * );
+void CloseDemux__avformat( vlc_object_t * );
/* Mux module */
-int OpenMux ( vlc_object_t * );
-void CloseMux( vlc_object_t * );
+int OpenMux__avformat ( vlc_object_t * );
+void CloseMux__avformat( vlc_object_t * );
#define MUX_TEXT N_("Avformat mux")
#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
index 2f3b907410..7c1a1a5319 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -148,7 +148,7 @@
static void get_rotation(es_format_t *fmt, AVStream *s)
}
}
-int OpenDemux( vlc_object_t *p_this )
+int OpenDemux__avformat( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
@@ -288,7 +288,7 @@
int OpenDemux( vlc_object_t *p_this )
if( !p_io_buffer )
{
free( psz_url );
- CloseDemux( p_this );
+ CloseDemux__avformat( p_this );
return VLC_ENOMEM;
}
@@ -297,7 +297,7 @@
int OpenDemux( vlc_object_t *p_this )
{
av_free( p_io_buffer );
free( psz_url );
- CloseDemux( p_this );
+ CloseDemux__avformat( p_this );
return VLC_ENOMEM;
}
@@ -307,7 +307,7 @@
int OpenDemux( vlc_object_t *p_this )
{
av_free( p_io_buffer );
free( psz_url );
- CloseDemux( p_this );
+ CloseDemux__avformat( p_this );
return VLC_ENOMEM;
}
@@ -322,7 +322,7 @@
int OpenDemux( vlc_object_t *p_this )
av_free( pb );
p_sys->ic = NULL;
free( psz_url );
- CloseDemux( p_this );
+ CloseDemux__avformat( p_this );
return VLC_EGENERIC;
}
free( psz_url );
@@ -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
*****************************************************************************/
-void CloseDemux( vlc_object_t *p_this )
+void CloseDemux__avformat( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 1c01253184..b256f3d2d5 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -84,7 +84,7 @@
static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
/*****************************************************************************
* Open
*****************************************************************************/
-int OpenMux( vlc_object_t *p_this )
+int OpenMux__avformat( vlc_object_t *p_this )
{
AVOutputFormat *file_oformat;
sout_mux_t *p_mux = (sout_mux_t*)p_this;
@@ -163,7 +163,7 @@
int OpenMux( vlc_object_t *p_this )
/*****************************************************************************
* Close
*****************************************************************************/
-void CloseMux( vlc_object_t *p_this )
+void CloseMux__avformat( vlc_object_t *p_this )
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
diff --git a/modules/demux/ttml.c b/modules/demux/ttml.c
index a22cbb6a79..b4de0dd009 100644
--- a/modules/demux/ttml.c
+++ b/modules/demux/ttml.c
@@ -391,7 +391,7 @@
static int Demux( demux_t* p_demux )
return VLC_DEMUXER_SUCCESS;
}
-int OpenDemux( vlc_object_t* p_this )
+int OpenDemux__ttml( vlc_object_t* p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
@@ -530,12 +530,12 @@
int OpenDemux( vlc_object_t* p_this )
return VLC_SUCCESS;
error:
- CloseDemux( p_demux );
+ CloseDemux__ttml( p_demux );
return VLC_EGENERIC;
}
-void CloseDemux( demux_t* p_demux )
+void CloseDemux__ttml( demux_t* p_demux )
{
demux_sys_t* p_sys = p_demux->p_sys;
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 1397aed9b8..31103f3631 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -113,7 +113,7 @@
vlc_module_begin ()
change_integer_list( phosphor_dimmer_list, phosphor_dimmer_list_text )
change_safe ()
add_shortcut( "deinterlace" )
- set_callbacks( Open, Close )
+ set_callbacks( Open__deinterlace, Close )
vlc_module_end ()
/*****************************************************************************
@@ -124,7 +124,7 @@
vlc_module_end ()
* Available config options for the deinterlacer module.
*
* Note that also algorithm-specific options must be listed here,
- * and reading logic for them implemented in Open().
+ * and reading logic for them implemented in Open__deinterlace().
*/
static const char *const ppsz_filter_options[] = {
"mode", "phosphor-chroma", "phosphor-dimmer",
@@ -239,7 +239,7 @@
static void GetOutputFormat( filter_t *p_filter,
* video filter functions
*****************************************************************************/
-/* This is the filter function. See Open(). */
+/* This is the filter function. See Open__deinterlace(). */
picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
{
return DoDeinterlacing( p_filter, &p_filter->p_sys->context, p_pic );
@@ -273,10 +273,10 @@
int Mouse( filter_t *p_filter,
/*****************************************************************************
- * Open
+ * Open__deinterlace
*****************************************************************************/
-int Open( vlc_object_t *p_this )
+int Open__deinterlace( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t*)p_this;
filter_sys_t *p_sys;
diff --git a/modules/video_filter/deinterlace/deinterlace.h b/modules/video_filter/deinterlace/deinterlace.h
index ecc26e0d60..0c71cda6d2 100644
--- a/modules/video_filter/deinterlace/deinterlace.h
+++ b/modules/video_filter/deinterlace/deinterlace.h
@@ -92,7 +92,7 @@
struct filter_sys_t
/**
* Top-level filtering method.
*
- * Open() sets this up as the processing method (pf_video_filter)
+ * Open__deinterlace() sets this up as the processing method (pf_video_filter)
* in the filter structure.
*
* Note that there is no guarantee that the returned picture directly
@@ -126,7 +126,7 @@
struct filter_sys_t
* @param p_filter The filter instance.
* @param p_pic The latest input picture.
* @return Deinterlaced picture(s). Linked list of picture_t's or NULL.
- * @see Open()
+ * @see Open__deinterlace()
* @see filter_t
* @see filter_sys_t
*/
@@ -142,7 +142,7 @@
picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
* wants to convert the output to a format different
* from the input. See SetFilterMethod().
*
- * Open() is atomic: if an error occurs, the state of p_this
+ * Open__deinterlace() is atomic: if an error occurs, the state of p_this
* is left as it was before the call to this function.
*
* @param p_this The filter instance as vlc_object_t.
@@ -153,17 +153,17 @@
picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
* @see IsChromaSupported()
* @see SetFilterMethod()
*/
-int Open( vlc_object_t *p_this );
+int Open__deinterlace( vlc_object_t *p_this );
/**
* Resets the filter state, including resetting all algorithm-specific state
* and discarding all histories, but does not stop the filter.
*
- * Open() sets this up as the flush method (pf_flush)
+ * Open__deinterlace() sets this up as the flush method (pf_flush)
* in the filter structure.
*
* @param p_filter The filter instance.
- * @see Open()
+ * @see Open__deinterlace()
* @see filter_t
* @see filter_sys_t
* @see metadata_history_t
@@ -175,7 +175,7 @@
void Flush( filter_t *p_filter );
/**
* Mouse callback for the deinterlace filter.
*
- * Open() sets this up as the mouse callback method (pf_video_mouse)
+ * Open__deinterlace() sets this up as the mouse callback method (pf_video_mouse)
* in the filter structure.
*
* Currently, this handles the scaling of the y coordinate for algorithms
@@ -187,7 +187,7 @@
void Flush( filter_t *p_filter );
* @param[in] p_new Latest mouse position data.
* @return VLC error code; currently always VLC_SUCCESS.
* @retval VLC_SUCCESS All ok.
- * @see Open()
+ * @see Open__deinterlace()
* @see filter_t
* @see vlc_mouse_t
*/
@@ -238,7 +238,7 @@
void Close( vlc_object_t *p_this );
* but the new value will only take effect upon the next call to Deinterlace()
* (i.e. at the next incoming frame).
*
- * The first-ever frame that arrives to the filter after Open() is always
+ * The first-ever frame that arrives to the filter after Open__deinterlace() is always
* handled as having i_frame_offset = 0. For the second and all subsequent
* frames, each algorithm is responsible for setting the offset correctly.
* (The default is 0, so if that is correct, there's no need to do anything.)
--
2.14.2
Resources/MobileVLCKit/patches/001
5
-contrib-use-live555-version-that-is-compatible-with-.patch
→
Resources/MobileVLCKit/patches/001
4
-contrib-use-live555-version-that-is-compatible-with-.patch
View file @
89e531e1
From
f0682a1f6acc25b28251fccc2087c194ab0cda9
0 Mon Sep 17 00:00:00 2001
From
7ee22ab9ee43d4bac2f8ccd7f00eb91db756d5c
0 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 1
5/15
] contrib: use live555 version that is compatible with
Subject: [PATCH 1
4/14
] contrib: use live555 version that is compatible with
LGPL2
---
...
...
buildMobileVLCKit.sh
View file @
89e531e1
...
...
@@ -22,7 +22,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR
=
empty
FARCH
=
"all"
TESTEDHASH
=
0885ed8
TESTEDHASH
=
ec31390c5
if
[
-z
"
$MAKE_JOBS
"
]
;
then
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