[vlc-commits] Fix issues with replaced compat functions in C++ modules
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Tue Aug 26
19:37:06 2014 +| [dac278775ae14655179ed4a40231043a5b786f40] | committer:
Jean-Baptiste Kempf
Fix issues with replaced compat functions in C++ modules
Notably poll, inet*, swab, *rand48, and tsearch
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dac278775ae14655179ed4a40231043a5b786f40
---
include/vlc_fixups.h |8
1 file changed, 8 insertions(+)
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index c3d5fac..a4b9b2d 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -256,6 +256,10 @@ static inline locale_t newlocale(int mask, const char *
locale, locale_t base)
#define N_(str) gettext_noop (str)
#define gettext_noop(str) (str)
+#ifdef __cplusplus
+extern C {
+#endif
+
#ifndef HAVE_SWAB
void swab (const void *, void *, ssize_t);
#endif
@@ -339,6 +343,10 @@ long jrand48 (unsigned short subi[3]);
long nrand48 (unsigned short subi[3]);
#endif
+#ifdef __cplusplus
+} /* extern C */
+#endif
+
#ifdef __OS2__
# undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */
#endif
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Contribs: update Nettle to 2.7.1
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu Aug 28 08:36:30 2014 +0200| [dc2a22c095453c40657f5ac83a289740beceb30e] | committer: Jean-Baptiste Kempf Contribs: update Nettle to 2.7.1 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dc2a22c095453c40657f5ac83a289740beceb30e --- contrib/src/nettle/SHA512SUMS |2 +- contrib/src/nettle/rules.mak |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/nettle/SHA512SUMS b/contrib/src/nettle/SHA512SUMS index 2e917c9..38275a3 100644 --- a/contrib/src/nettle/SHA512SUMS +++ b/contrib/src/nettle/SHA512SUMS @@ -1 +1 @@ -394cbe567f958594e1bca42b48802e2fbc9c31c468cd1c399a0aec6f94138220b4bf3c307590262314664e15a74a7a52f9fd2b4f9fb01dde669e1fbe23e57caf nettle-2.7.tar.gz +297c69e90bbd448f72e854abe5cc7868c08d710e1c1bcd6a14adf06e25629d58a3ef4d65ab588d001ec7091aa583032312ad15b416ea5479e5bf0ea63717f473 nettle-2.7.1.tar.gz diff --git a/contrib/src/nettle/rules.mak b/contrib/src/nettle/rules.mak index 22b1975..f832eda 100644 --- a/contrib/src/nettle/rules.mak +++ b/contrib/src/nettle/rules.mak @@ -1,6 +1,6 @@ # Nettle -NETTLE_VERSION := 2.7 +NETTLE_VERSION := 2.7.1 NETTLE_URL := ftp://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz ifeq ($(call need_pkg,nettle = 2.7),) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] daala: add decoder support
vlc | branch: master | Tristan Matthews le.business...@gmail.com | Wed Aug 20 14:27:04 2014 -0700| [774d273f23b601a5e3fd63835ba72b755dadfce7] | committer: Tristan Matthews daala: add decoder support http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=774d273f23b601a5e3fd63835ba72b755dadfce7 --- configure.ac |5 + include/vlc_fourcc.h |1 + modules/codec/Makefile.am |7 + modules/codec/daala.c | 508 + 4 files changed, 521 insertions(+) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=774d273f23b601a5e3fd63835ba72b755dadfce7 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: ogg: daala support
vlc | branch: master | Tristan Matthews le.business...@gmail.com | Wed Aug 20
17:23:41 2014 -0700| [1d3d32373a2c919f9741c2f4c0fd81de1ab14238] | committer:
Tristan Matthews
demux: ogg: daala support
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d3d32373a2c919f9741c2f4c0fd81de1ab14238
---
modules/demux/ogg.c | 102 +++
modules/demux/oggseek.c |5 ++-
2 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index b61366b..192e3e0 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -136,6 +136,7 @@ static void Ogg_ResetStream( logical_stream_t *p_stream );
static void Ogg_ExtractMeta( demux_t *p_demux, es_format_t *p_fmt, const
uint8_t *p_headers, int i_headers );
/* Logical bitstream headers */
+static bool Ogg_ReadDaalaHeader( logical_stream_t *, ogg_packet * );
static bool Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
static bool Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
static bool Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
@@ -446,6 +447,13 @@ static int Demux( demux_t * p_demux )
Ogg_ReadTheoraHeader( p_stream, oggpacket );
p_stream-i_secondary_header_packets = 0;
}
+else if( p_stream-fmt.i_codec == VLC_CODEC_DAALA
+oggpacket.bytes = 6
+! memcmp( oggpacket.packet, \x80daala, 6 ) )
+{
+Ogg_ReadDaalaHeader( p_stream, oggpacket );
+p_stream-i_secondary_header_packets = 0;
+}
else if( p_stream-fmt.i_codec == VLC_CODEC_VORBIS
oggpacket.bytes = 7
! memcmp( oggpacket.packet, \x01vorbis, 7 ) )
@@ -938,6 +946,7 @@ static void Ogg_UpdatePCR( demux_t *p_demux,
logical_stream_t *p_stream,
else if( p_oggpacket-granulepos 0 )
{
if( p_stream-fmt.i_codec == VLC_CODEC_THEORA ||
+p_stream-fmt.i_codec == VLC_CODEC_DAALA ||
p_stream-fmt.i_codec == VLC_CODEC_KATE ||
p_stream-fmt.i_codec == VLC_CODEC_VP8 ||
p_stream-fmt.i_codec == VLC_CODEC_DIRAC ||
@@ -1162,6 +1171,12 @@ static void Ogg_DecodePacket( demux_t *p_demux,
b_xiph = true;
break;
+case VLC_CODEC_DAALA:
+if( p_stream-i_packets_backup == 3 )
+p_stream-b_force_backup = false;
+b_xiph = true;
+break;
+
case VLC_CODEC_SPEEX:
if( p_stream-i_packets_backup == 2 +
p_stream-i_extra_headers_packets )
p_stream-b_force_backup = false;
@@ -1339,6 +1354,7 @@ static void Ogg_DecodePacket( demux_t *p_demux,
p_stream-fmt.i_codec != VLC_CODEC_FLAC
p_stream-fmt.i_codec != VLC_CODEC_TARKIN
p_stream-fmt.i_codec != VLC_CODEC_THEORA
+p_stream-fmt.i_codec != VLC_CODEC_DAALA
p_stream-fmt.i_codec != VLC_CODEC_CMML
p_stream-fmt.i_codec != VLC_CODEC_DIRAC
p_stream-fmt.i_codec != VLC_CODEC_KATE )
@@ -1600,6 +1616,21 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
p_ogg-i_streams--;
}
}
+/* Check for Daala header */
+else if( oggpacket.bytes = 6
+ ! memcmp( oggpacket.packet, \x80daala, 6 ) )
+{
+if ( Ogg_ReadDaalaHeader( p_stream, oggpacket ) )
+msg_Dbg( p_demux,
+ found daala header, bitrate: %i, rate: %f,
+ p_stream-fmt.i_bitrate, p_stream-f_rate );
+else
+{
+msg_Dbg( p_demux, found invalid Daala header );
+Ogg_LogicalStreamDelete( p_demux, p_stream );
+p_ogg-i_streams--;
+}
+}
/* Check for Dirac header */
else if( ( oggpacket.bytes = 5
! memcmp( oggpacket.packet, BBCD\x00, 5 ) ) ||
@@ -2381,6 +2412,7 @@ static void Ogg_ExtractMeta( demux_t *p_demux,
es_format_t *p_fmt, const uint8_t
/* 3 headers with the 2° one being the comments */
case VLC_CODEC_VORBIS:
case VLC_CODEC_THEORA:
+case VLC_CODEC_DAALA:
Ogg_ExtractXiphMeta( p_demux, p_fmt, p_headers, i_headers, 1+6 );
break;
case VLC_CODEC_OPUS:
@@ -2484,6 +2516,68 @@ static bool Ogg_ReadTheoraHeader( logical_stream_t
*p_stream,
return true;
}
+static bool Ogg_ReadDaalaHeader( logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+oggpack_buffer opb;
+uint32_t i_timebase_numerator;
+uint32_t i_timebase_denominator;
+int i_keyframe_frequency_force;
+uint8_t i_major;
+uint8_t
[vlc-commits] daala: update NEWS, MODULES_LIST and POTFILES.in
vlc | branch: master | Tristan Matthews le.business...@gmail.com | Thu Aug 28 03:12:04 2014 -0400| [9fc9d52165a18df59b978c88e9796a1f01fc6aa3] | committer: Tristan Matthews daala: update NEWS, MODULES_LIST and POTFILES.in http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9fc9d52165a18df59b978c88e9796a1f01fc6aa3 --- NEWS |1 + modules/MODULES_LIST |1 + po/POTFILES.in |1 + 3 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index d290d06..c58fd4e 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ Decoder: * OMX GPU-zerocopy support for decoding and display on Android using OpenMax IL * Support 4:4:4 chroma sampling with VDPAU hw acceleration * Support for ARIB B24 subtitles + * Support for Daala video Demuxers: * Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS) diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST index 8666bcb..0a73ca4 100644 --- a/modules/MODULES_LIST +++ b/modules/MODULES_LIST @@ -77,6 +77,7 @@ $Id$ * croppadd: Crop/Padd image filter * crystalhd: crystalhd decoder * cvdsub: CVD subtitles decoder + * daala: a daala video decoder/packetizer using libdaala * dash: MPEG DASH playback * dbus: D-Bus control interface * dbus_screensaver: preventing the computer from suspending diff --git a/po/POTFILES.in b/po/POTFILES.in index f56ab10..b62ee5b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -362,6 +362,7 @@ modules/codec/cc.h modules/codec/cdg.c modules/codec/crystalhd.c modules/codec/cvdsub.c +modules/codec/daala.c modules/codec/ddummy.c modules/codec/dmo/buffer.c modules/codec/dmo/dmo.c ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] os2: getaddrinfo: fix typo
vlc | branch: master | KO Myung-Hun kom...@gmail.com | Thu Aug 28 16:14:51 2014 +0900| [ecd7f4e2e784e908626afe9804bc380abb07115e] | committer: Jean-Baptiste Kempf os2: getaddrinfo: fix typo Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ecd7f4e2e784e908626afe9804bc380abb07115e --- src/os2/getaddrinfo.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os2/getaddrinfo.c b/src/os2/getaddrinfo.c index c0dc419..1a3f8a4 100644 --- a/src/os2/getaddrinfo.c +++ b/src/os2/getaddrinfo.c @@ -261,7 +261,7 @@ getaddrinfo (const char *node, const char *service, protocol = IPPROTO_UDP; break; -#ifndef SOCK_RAW +#ifdef SOCK_RAW case SOCK_RAW: #endif case 0: ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] DirectDraw/Direct3D: make a clean copy of the video-format
vlc | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 14:08:58 2014 +0200| [2f3d2d96b82b4eea9a17861b3da294457d1b4896] | committer: Jean-Baptiste Kempf DirectDraw/Direct3D: make a clean copy of the video-format Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f3d2d96b82b4eea9a17861b3da294457d1b4896 --- modules/video_output/msw/direct3d.c |3 ++- modules/video_output/msw/directx.c |3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c index fc959fc..1d7c7c8 100644 --- a/modules/video_output/msw/direct3d.c +++ b/modules/video_output/msw/direct3d.c @@ -228,7 +228,8 @@ static int Open(vlc_object_t *object) var_AddCallback(vd, video-wallpaper, DesktopCallback, NULL); /* Setup vout_display now that everything is fine */ -vd-fmt = fmt; +video_format_Clean(vd-fmt); +video_format_Copy(vd-fmt, fmt); vd-info = info; vd-pool= Pool; diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c index 4832fd0..afaa8f8 100644 --- a/modules/video_output/msw/directx.c +++ b/modules/video_output/msw/directx.c @@ -210,7 +210,8 @@ static int Open(vlc_object_t *object) var_AddCallback(vd, video-wallpaper, WallpaperCallback, NULL); /* Setup vout_display now that everything is fine */ -vd-fmt = fmt; +video_format_Clean(vd-fmt); +video_format_Copy(vd-fmt, fmt); vd-info= info; vd-pool= Pool; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] compat: poll: fix compilation
vlc | branch: master | KO Myung-Hun kom...@gmail.com | Thu Aug 28 19:15:58 2014 +0900| [5064767f8e2de7299bbb00652fd04ac5a70de4ce] | committer: Jean-Baptiste Kempf compat: poll: fix compilation Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5064767f8e2de7299bbb00652fd04ac5a70de4ce --- compat/poll.c |1 + 1 file changed, 1 insertion(+) diff --git a/compat/poll.c b/compat/poll.c index 21e6d59..b88f7fd 100644 --- a/compat/poll.c +++ b/compat/poll.c @@ -36,6 +36,7 @@ #else # include sys/time.h # include sys/select.h +# include fcntl.h #endif int (poll) (struct pollfd *fds, unsigned nfds, int timeout) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32 threads: fix memory leak of detached thread
vlc | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 13:22:33
2014 +0200| [b1f9242606caf549a03c6b11b00c66c2c1af27cb] | committer:
Jean-Baptiste Kempf
Win32 threads: fix memory leak of detached thread
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1f9242606caf549a03c6b11b00c66c2c1af27cb
---
src/win32/thread.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/win32/thread.c b/src/win32/thread.c
index ed3c4f9..fe17ad5 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -503,7 +503,10 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool
detached,
}
if (detached)
+{
CloseHandle((HANDLE)h);
+th-id = NULL;
+}
else
th-id = (HANDLE)h;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avcodec: fix memory leak
vlc | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 13:38:12 2014 +0200| [8aa841924e2fc8f1e9c47c9ce629032705a71a88] | committer: Jean-Baptiste Kempf avcodec: fix memory leak Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8aa841924e2fc8f1e9c47c9ce629032705a71a88 --- modules/codec/avcodec/video.c |1 + 1 file changed, 1 insertion(+) diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index e75cc21..e5f45c7 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -592,6 +592,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) i_used = avcodec_decode_video2( p_context, p_sys-p_ff_pic, b_gotpicture, pkt ); +av_free_packet( pkt ); wait_mt( p_sys ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] filesystem: avoid potential qsort(NULL)
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont r...@remlab.net | Mon Aug 25 21:35:27 2014 +0300| [b7740617b4c2e085078faf08c938a3a3cbe14efd] | committer: Jean-Baptiste Kempf filesystem: avoid potential qsort(NULL) (cherry picked from commit 558e6b78d4c269a2de4a152cd2c72cb685c65027) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b7740617b4c2e085078faf08c938a3a3cbe14efd --- src/text/filesystem.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text/filesystem.c b/src/text/filesystem.c index 31d4dc6..4b4d0bb 100644 --- a/src/text/filesystem.c +++ b/src/text/filesystem.c @@ -153,7 +153,7 @@ int vlc_loaddir( DIR *dir, char ***namelist, num++; } -if (compar != NULL) +if (compar != NULL num 0) qsort (tab, num, sizeof (*tab), (int (*)( const void *, const void *))compar); *namelist = tab; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Contribs: update Nettle to 2.7.1
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu Aug 28 08:36:30 2014 +0200| [39fb0652d989e84d4fb513b032002af43ed501e0] | committer: Jean-Baptiste Kempf Contribs: update Nettle to 2.7.1 (cherry picked from commit dc2a22c095453c40657f5ac83a289740beceb30e) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=39fb0652d989e84d4fb513b032002af43ed501e0 --- contrib/src/nettle/SHA512SUMS |2 +- contrib/src/nettle/rules.mak |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/nettle/SHA512SUMS b/contrib/src/nettle/SHA512SUMS index 2e917c9..38275a3 100644 --- a/contrib/src/nettle/SHA512SUMS +++ b/contrib/src/nettle/SHA512SUMS @@ -1 +1 @@ -394cbe567f958594e1bca42b48802e2fbc9c31c468cd1c399a0aec6f94138220b4bf3c307590262314664e15a74a7a52f9fd2b4f9fb01dde669e1fbe23e57caf nettle-2.7.tar.gz +297c69e90bbd448f72e854abe5cc7868c08d710e1c1bcd6a14adf06e25629d58a3ef4d65ab588d001ec7091aa583032312ad15b416ea5479e5bf0ea63717f473 nettle-2.7.1.tar.gz diff --git a/contrib/src/nettle/rules.mak b/contrib/src/nettle/rules.mak index 22b1975..f832eda 100644 --- a/contrib/src/nettle/rules.mak +++ b/contrib/src/nettle/rules.mak @@ -1,6 +1,6 @@ # Nettle -NETTLE_VERSION := 2.7 +NETTLE_VERSION := 2.7.1 NETTLE_URL := ftp://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz ifeq ($(call need_pkg,nettle = 2.7),) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] compat: poll: fix compilation
vlc/vlc-2.2 | branch: master | KO Myung-Hun kom...@gmail.com | Thu Aug 28 19:15:58 2014 +0900| [5ffac32ccd82f921eebb943b6aa2cb2edf1d0293] | committer: Jean-Baptiste Kempf compat: poll: fix compilation Signed-off-by: Jean-Baptiste Kempf j...@videolan.org (cherry picked from commit 5064767f8e2de7299bbb00652fd04ac5a70de4ce) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5ffac32ccd82f921eebb943b6aa2cb2edf1d0293 --- compat/poll.c |1 + 1 file changed, 1 insertion(+) diff --git a/compat/poll.c b/compat/poll.c index 21e6d59..b88f7fd 100644 --- a/compat/poll.c +++ b/compat/poll.c @@ -36,6 +36,7 @@ #else # include sys/time.h # include sys/select.h +# include fcntl.h #endif int (poll) (struct pollfd *fds, unsigned nfds, int timeout) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] lua: reactivate vlclua_net_poll() on windows
vlc/vlc-2.2 | branch: master | Hannes Domani ssb...@yahoo.de | Sun Aug 17
14:38:54 2014 +0200| [8c3414087f9e1b4f26d534df138444b62b22c4c1] | committer:
Jean-Baptiste Kempf
lua: reactivate vlclua_net_poll() on windows
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit a916d7be15713e577eacb88a18e6e6990e5213d2)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8c3414087f9e1b4f26d534df138444b62b22c4c1
---
modules/lua/libs/net.c | 39 +--
modules/lua/vlc.h |2 --
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c
index 913db5b..4d6e87b 100644
--- a/modules/lua/libs/net.c
+++ b/modules/lua/libs/net.c
@@ -312,7 +312,6 @@ static int vlclua_net_recv( lua_State *L )
return 1;
}
-#ifndef _WIN32
/*
*
*/
@@ -380,6 +379,7 @@ static int vlclua_fd_open( lua_State *L )
}
*/
+#ifndef _WIN32
static int vlclua_fd_write( lua_State *L )
{
int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
@@ -492,8 +492,8 @@ static const luaL_Reg vlclua_net_intf_reg[] = {
{ close, vlclua_net_close },
{ send, vlclua_net_send },
{ recv, vlclua_net_recv },
-#ifndef _WIN32
{ poll, vlclua_net_poll },
+#ifndef _WIN32
{ read, vlclua_fd_read },
{ write, vlclua_fd_write },
#endif
@@ -521,11 +521,40 @@ static void luaopen_net_intf( lua_State *L )
lua_setfield( L, -2, net );
}
+#ifdef _WIN32
+static int vlc_socket_pair( int fds[2] )
+{
+struct sockaddr_in inaddr;
+struct sockaddr addr;
+SOCKET lst = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP );
+memset( inaddr, 0, sizeof( inaddr ) );
+memset( addr, 0, sizeof( addr ) );
+inaddr.sin_family = AF_INET;
+inaddr.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
+inaddr.sin_port = 0;
+int yes = 1;
+setsockopt( lst, SOL_SOCKET, SO_REUSEADDR, (char*)yes, sizeof( yes ) );
+bind( lst, (struct sockaddr *)inaddr, sizeof( inaddr ) );
+listen( lst, 1 );
+int len = sizeof( inaddr );
+getsockname( lst, addr, len );
+fds[0] = socket( AF_INET, SOCK_STREAM, 0 );
+connect( fds[0], addr, len );
+fds[1] = accept( lst, 0, 0 );
+closesocket( lst );
+
+return 0;
+}
+#endif
+
int vlclua_fd_init( lua_State *L, vlclua_dtable_t *dt )
{
#ifndef _WIN32
if( vlc_pipe( dt-fd ) )
return -1;
+#else
+if( vlc_socket_pair( dt-fd ) )
+return -1;
#endif
dt-fdv = NULL;
dt-fdc = 0;
@@ -539,6 +568,9 @@ void vlclua_fd_interrupt( vlclua_dtable_t *dt )
#ifndef _WIN32
close( dt-fd[1] );
dt-fd[1] = -1;
+#else
+closesocket( dt-fd[0] );
+dt-fd[0] = -1;
#endif
}
@@ -553,5 +585,8 @@ void vlclua_fd_cleanup( vlclua_dtable_t *dt )
if( dt-fd[1] != -1 )
close( dt-fd[1] );
close( dt-fd[0] );
+#else
+if( dt-fd[0] != -1 )
+closesocket( dt-fd[0] );
#endif
}
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index be8b0ee..efd94f1 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -171,9 +171,7 @@ typedef struct
{
int *fdv;
unsigned fdc;
-#ifndef _WIN32
int fd[2];
-#endif
} vlclua_dtable_t;
int vlclua_fd_init( lua_State *, vlclua_dtable_t * );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] os2: getaddrinfo: fix typo
vlc/vlc-2.2 | branch: master | KO Myung-Hun kom...@gmail.com | Thu Aug 28 16:14:51 2014 +0900| [550b629c83ed85e5a84fd60285e565f079f57484] | committer: Jean-Baptiste Kempf os2: getaddrinfo: fix typo Signed-off-by: Jean-Baptiste Kempf j...@videolan.org (cherry picked from commit ecd7f4e2e784e908626afe9804bc380abb07115e) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=550b629c83ed85e5a84fd60285e565f079f57484 --- src/os2/getaddrinfo.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os2/getaddrinfo.c b/src/os2/getaddrinfo.c index c0dc419..1a3f8a4 100644 --- a/src/os2/getaddrinfo.c +++ b/src/os2/getaddrinfo.c @@ -261,7 +261,7 @@ getaddrinfo (const char *node, const char *service, protocol = IPPROTO_UDP; break; -#ifndef SOCK_RAW +#ifdef SOCK_RAW case SOCK_RAW: #endif case 0: ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32 threads: fix memory leak of detached thread
vlc/vlc-2.2 | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28
13:22:33 2014 +0200| [5fa429b3ec9af47b024f30cdff0fd7f47becf8c5] | committer:
Jean-Baptiste Kempf
Win32 threads: fix memory leak of detached thread
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit b1f9242606caf549a03c6b11b00c66c2c1af27cb)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5fa429b3ec9af47b024f30cdff0fd7f47becf8c5
---
src/win32/thread.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/win32/thread.c b/src/win32/thread.c
index ed3c4f9..fe17ad5 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -503,7 +503,10 @@ static int vlc_clone_attr (vlc_thread_t *p_handle, bool
detached,
}
if (detached)
+{
CloseHandle((HANDLE)h);
+th-id = NULL;
+}
else
th-id = (HANDLE)h;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] filter_chain: fix memory leaks
vlc | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 13:25:37 2014 +0200| [231d1b6aa43a24078384e7a6663a93a1e6df4c5b] | committer: Rémi Denis-Courmont filter_chain: fix memory leaks Signed-off-by: Rémi Denis-Courmont r...@remlab.net http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=231d1b6aa43a24078384e7a6663a93a1e6df4c5b --- src/misc/filter_chain.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c index 3e605a6..b0ad76e 100644 --- a/src/misc/filter_chain.c +++ b/src/misc/filter_chain.c @@ -298,6 +298,8 @@ void filter_chain_DeleteFilter( filter_chain_t *chain, filter_t *filter ) FilterDeletePictures( chained-filter, chained-pending ); free( chained-mouse ); +es_format_Clean( filter-fmt_out ); +es_format_Clean( filter-fmt_in ); vlc_object_release( filter ); /* FIXME: check fmt_in/fmt_out consitency */ } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Direct3D: fix memory leak
vlc | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 14:13:03
2014 +0200| [9ac30b31fc91e5a47135c1ca2f9c08ea0f5c255d] | committer: Rémi
Denis-Courmont
Direct3D: fix memory leak
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ac30b31fc91e5a47135c1ca2f9c08ea0f5c255d
---
modules/video_output/msw/direct3d.c |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/modules/video_output/msw/direct3d.c
b/modules/video_output/msw/direct3d.c
index 1d7c7c8..7fa4585 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -512,11 +512,9 @@ static HINSTANCE Direct3DLoadShaderLibrary(void)
{
HINSTANCE instance = NULL;
for (int i = 43; i 23; --i) {
-char *filename = NULL;
-if (asprintf(filename, D3dx9_%d.dll, i) == -1)
-continue;
-instance = LoadLibrary(ToT(filename));
-free(filename);
+TCHAR filename[16];
+_sntprintf(filename, 16, TEXT(D3dx9_%d.dll), i);
+instance = LoadLibrary(filename);
if (instance)
break;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] fontconfig: fix memory leak
vlc | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 15:22:22 2014 +0200| [38dab127daa980ca706b5315be17736f8f795e42] | committer: Rémi Denis-Courmont fontconfig: fix memory leak Signed-off-by: Rémi Denis-Courmont r...@remlab.net http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=38dab127daa980ca706b5315be17736f8f795e42 --- contrib/src/fontconfig/fontconfig-noxml2.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/fontconfig/fontconfig-noxml2.patch b/contrib/src/fontconfig/fontconfig-noxml2.patch index af95d56..b5a3ee4 100644 --- a/contrib/src/fontconfig/fontconfig-noxml2.patch +++ b/contrib/src/fontconfig/fontconfig-noxml2.patch @@ -110,7 +110,7 @@ diff -ruN fontconfig/src/fcinit.c fontconfig.new/src/fcinit.c if (!config) goto bail0; -if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS)) -+char *path = malloc( MAX_PATH + 1 ); ++char path[MAX_PATH + 8]; +GetWindowsDirectory( path, MAX_PATH + 1 ); +strcat( path, \\fonts ); +//printf( Fonts dir: %s\n, path ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] fontconfig: fix memory leak
vlc/vlc-2.2 | branch: master | Hannes Domani ssb...@yahoo.de | Thu Aug 28 15:22:22 2014 +0200| [a15bef7cbb449dca267f68eb5f28ad13a9220ae9] | committer: Jean-Baptiste Kempf fontconfig: fix memory leak Signed-off-by: Rémi Denis-Courmont r...@remlab.net (cherry picked from commit 38dab127daa980ca706b5315be17736f8f795e42) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a15bef7cbb449dca267f68eb5f28ad13a9220ae9 --- contrib/src/fontconfig/fontconfig-noxml2.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/fontconfig/fontconfig-noxml2.patch b/contrib/src/fontconfig/fontconfig-noxml2.patch index a560f96..0f35e99 100644 --- a/contrib/src/fontconfig/fontconfig-noxml2.patch +++ b/contrib/src/fontconfig/fontconfig-noxml2.patch @@ -95,7 +95,7 @@ diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c if (!config) goto bail0; -if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS)) -+char *path = malloc( MAX_PATH + 1 ); ++char path[MAX_PATH + 8]; +GetWindowsDirectory( path, MAX_PATH + 1 ); +strcat( path, \\fonts ); +//printf( Fonts dir: %s\n, path ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] window: define Wayland surface type
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Wed Aug 27
19:39:32 2014 +0300| [6eafc08b3ed0421b66dc2eb7e44e9cb465b6f987] | committer:
Rémi Denis-Courmont
window: define Wayland surface type
The convention used here matches with the Qt Wayland native platform,
and seems most generic. Note that Wayland does not allow sharing
surface handles between multiple display connections in general, and
multiple processes in particular.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6eafc08b3ed0421b66dc2eb7e44e9cb465b6f987
---
include/vlc_vout_window.h |5 +
src/video_output/window.c |5 +
2 files changed, 10 insertions(+)
diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index ed7d42c..a633b0d 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -36,6 +36,8 @@
typedef struct vout_window_t vout_window_t;
typedef struct vout_window_sys_t vout_window_sys_t;
+struct wl_display;
+struct wl_surface;
/**
* Window handle type
@@ -46,6 +48,7 @@ enum {
VOUT_WINDOW_TYPE_HWND,
VOUT_WINDOW_TYPE_NSOBJECT,
VOUT_WINDOW_TYPE_ANDROID_NATIVE,
+VOUT_WINDOW_TYPE_WAYLAND,
};
/**
@@ -92,11 +95,13 @@ struct vout_window_t {
uint32_t xid;/* X11 windows ID */
void *nsobject; /* Mac OSX view object */
void *anativewindow; /* Android native window. */
+struct wl_surface *wl; /* Wayland surface */
} handle;
/* display server (mandatory) */
union {
char *x11; /* X11 display (NULL = use default) */
+struct wl_display *wl; /* Wayland struct wl_display pointer */
} display;
/* Control on the module (mandatory)
diff --git a/src/video_output/window.c b/src/video_output/window.c
index bc45bc2..8be5492 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -86,6 +86,11 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
type = vout window anative;
window-handle.anativewindow = NULL;
break;
+case VOUT_WINDOW_TYPE_WAYLAND:
+type = vout surface wl;
+window-handle.wl = NULL;
+window-display.wl = NULL;
+break;
default:
assert(0);
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] wl_shell_surface: basic Wayland shell surface window provider
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Thu Aug 28 00:12:40 2014 +0300| [06614416667e16179236401e92c88d02137b83b7] | committer: Rémi Denis-Courmont wl_shell_surface: basic Wayland shell surface window provider http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06614416667e16179236401e92c88d02137b83b7 --- configure.ac| 18 ++ modules/MODULES_LIST|1 + modules/video_output/Modules.am |9 + modules/video_output/wl/shell_surface.c | 303 +++ po/POTFILES.in |1 + 5 files changed, 332 insertions(+) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=06614416667e16179236401e92c88d02137b83b7 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Tag 2.2.0-pre3 : VLC media player 2.2.0-pre3 'Weatherwax'
[vlc/vlc-2.2] [branch: refs/tags/2.2.0-pre3] Tag:e1972aa1006c76cf74ec941ea1e94dfbbe87a807 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git?a=tag;h=e1972aa1006c76cf74ec941ea1e94dfbbe87a807 Tagger: Jean-Baptiste Kempf j...@videolan.org Date: Fri Aug 29 03:53:08 2014 +0200 VLC media player 2.2.0-pre3 'Weatherwax' This is the third pre-release of VLC media player 2.2.0 2.2.0 is a major version of VLC media player, introducing many new features fixing numerous bugs (~500 since 2.1.5, ~800 since 2.1.0). Notable features of this release are: - Hardware decoding and zero-copy rendering for Linux (VDPAU), Android (MediaCodec), Linux rPI (MMAL) - Automatic rotation to fight Vertical Video Syndrome, GPU accelerated - New formats supported, like MKV/Opus/VP9, H.265, Ogg/VP8, CAF, raw H.265 - Support for Digital Cinema Packages, Blu-Ray BD-J, FTPS - Restart where you left off feature on Qt and OS X interfaces - VLC Extensions and Addons downloader - HLSL shaders on Windows and CoreAnimation output on OS X - Port of the core on iOS, Android and WinRT Numerous bugs have been fixed: - Important refactor of the AVI, WMV, OGG and MP4 demuxers - Audio loops on Windows using DirectSound - OpenMax IL decoder, Speex, SRT support - AVI, Ogg and MP4 muxer Updates of the translations are, of course, present too. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
