[vlc-commits] contrib/macosx: set deployment target to 10.7 and ensure that the libraries make use of libc++
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Mon Jun 22 17:45:24 2015 +0200| [5a6765e203925c54d47d53ab8caaf49da62f4c17] | committer: Felix Paul Kühne contrib/macosx: set deployment target to 10.7 and ensure that the libraries make use of libc++ http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a6765e203925c54d47d53ab8caaf49da62f4c17 --- contrib/src/main.mak |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index bf002f1..549ea4c 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -102,7 +102,7 @@ CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLAT endif ifdef HAVE_MACOSX -MIN_OSX_VERSION=10.6 +MIN_OSX_VERSION=10.7 CC=xcrun cc CXX=xcrun c++ AR=xcrun ar @@ -110,7 +110,8 @@ LD=xcrun ld STRIP=xcrun strip RANLIB=xcrun ranlib EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) -EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) +EXTRA_CXXFLAGS += -stdlib=libc++ +EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -lc++ -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) ifeq ($(ARCH),x86_64) EXTRA_CFLAGS += -m64 EXTRA_LDFLAGS += -m64 @@ -169,7 +170,7 @@ cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - /dev/null | grep -E $(1)) EXTRA_CFLAGS += -I$(PREFIX)/include CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS) CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g -CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) -g +CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) $(EXTRA_CXXFLAGS) -g EXTRA_LDFLAGS += -L$(PREFIX)/lib LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/mac: set deployment target to 10.7 so we can use libc++
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Mon Jun 22 17:42:51 2015 +0200| [7a822345b44a0ef90fdaa4fa0dc96a9f2c08e63b] | committer: Felix Paul Kühne extras/mac: set deployment target to 10.7 so we can use libc++ http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7a822345b44a0ef90fdaa4fa0dc96a9f2c08e63b --- extras/package/macosx/build.sh |2 +- extras/package/macosx/configure.sh |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index e6d810f..6f7bbdd 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -10,7 +10,7 @@ info() } ARCH=x86_64 -MINIMAL_OSX_VERSION=10.6 +MINIMAL_OSX_VERSION=10.7 OSX_VERSION=`xcrun --show-sdk-version` SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh index d4af059..1db7cc6 100755 --- a/extras/package/macosx/configure.sh +++ b/extras/package/macosx/configure.sh @@ -35,7 +35,7 @@ OPTIONS= --disable-caca --disable-sdl --disable-macosx-dialog-provider ---with-macosx-version-min=10.6 +--with-macosx-version-min=10.7 export CFLAGS ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] configure/darwin: make use of gnu11 instead of gnu99, deploy libc++
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Mon Jun 22
17:46:04 2015 +0200| [75dc638cd1e74df34f951cdbe7f1c77c74794301] | committer:
Felix Paul Kühne
configure/darwin: make use of gnu11 instead of gnu99, deploy libc++
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=75dc638cd1e74df34f951cdbe7f1c77c74794301
---
configure.ac |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index c401f3f..3f6589c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,11 +166,11 @@ case ${host_os} in
esac
SYS=darwin
-CFLAGS=${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}
-CXXFLAGS=${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}
+CFLAGS=${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}
+CXXFLAGS=${CXXFLAGS} -D_INTL_REDIRECT_MACROS -stdlib=libc++ ${ARCH_flag}
CPPFLAGS=${CPPFLAGS} ${ARCH_flag}
-OBJCFLAGS=${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}
-LDFLAGS=${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}
+OBJCFLAGS=${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}
+LDFLAGS=${LDFLAGS} -lc++ -Wl,-headerpad_max_install_names ${ARCH_flag}
VLC_ADD_LIBS([libvlc
vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/ios: move to libc++
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Mon Jun 22
18:05:52 2015 +0200| [e2067626d27bb2c82039b64294cc820fb489c05e] | committer:
Felix Paul Kühne
extras/ios: move to libc++
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2067626d27bb2c82039b64294cc820fb489c05e
---
extras/package/ios/build.sh |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index c16d0c0..5b387fc 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -165,8 +165,7 @@ else
export CFLAGS=${CFLAGS} -miphoneos-version-min=${SIXTYFOURBIT_SDK_MIN}
fi
-export CXXFLAGS=${CFLAGS} -stdlib=libstdc++
-
+export CXXFLAGS=${CFLAGS}
export CPPFLAGS=${CFLAGS}
export CPP=xcrun cc -E
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] check_headers: fix regular expression
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Mon Jun 22
18:51:21 2015 +0300| [e051c631637b709c7f6c4b33e4af01707bbc2ac2] | committer:
Rémi Denis-Courmont
check_headers: fix regular expression
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e051c631637b709c7f6c4b33e4af01707bbc2ac2
---
src/check_headers | 25 +
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/check_headers b/src/check_headers
index d0b4bb7..9441035 100755
--- a/src/check_headers
+++ b/src/check_headers
@@ -5,14 +5,23 @@ cd $(dirname $0) || exit $?
# Look for configure #defines in public headers.
# There are incorrect, as external users don't have our config.h.
-regexp=$(cat ../config.h.in | \
- sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p' | \
- grep -v 'WORDS_BIGENDIAN' | \
- grep -v 'UNICODE' | \
- grep -v '__LIBVLC__' | \
- xargs | \
-sed -e 's/ /\\\(\\s\\\|$\\\)\\\| /g')
-regexp= $regexp\$
+regexp=
+
+while read l; do
+ d=$(echo $l | sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p')
+ test -z $d continue
+ test $d = WORDS_BIGENDIAN continue
+ test $d = UNICODE continue
+ test $d = __LIBVLC__ continue
+
+ if test -z $regexp; then
+ regexp=[^A-Za-z0-9_]\(
+ else
+ regexp=${regexp}\|
+ fi
+ regexp=${regexp}${d}
+done ../config.h.in
+regexp=${regexp}\)\([^A-Za-z0-9_]\|\$\)
echo Looking for private defines in public headers...
! grep -- $regexp $@ || exit $?
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] android_window: add chroma option
vlc | branch: master | Thomas Guillem tho...@gllm.fr | Mon Jun 22 16:47:05 2015 +0200| [64ea87bec4c5dd38c0aa800a0fc37cab406002dc] | committer: Thomas Guillem android_window: add chroma option This option was previously set by androidsurface. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64ea87bec4c5dd38c0aa800a0fc37cab406002dc --- modules/video_output/android/android_window.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c index 1beef8e..2d264e0 100644 --- a/modules/video_output/android/android_window.c +++ b/modules/video_output/android/android_window.c @@ -47,7 +47,7 @@ #define CHROMA_LONGTEXT N_(\ Force use of a specific chroma for output. Default is RGB32.) -#define CFG_PREFIX androidsurface- +#define CFG_PREFIX androidwindow- static int Open (vlc_object_t *); static void Close(vlc_object_t *); @@ -58,6 +58,7 @@ vlc_module_begin() set_description(N_(Android video output)) set_capability(vout display, 260) add_shortcut(androidwindow, android) +add_string(CFG_PREFIX chroma, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true) set_callbacks(Open, Close) vlc_module_end() ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS about SATIP
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Mon Jun 22 11:05:17 2015 +0200| [7d72f2c99a576f2ac9f2de56aa44467f0f0af25b] | committer: Jean-Baptiste Kempf NEWS about SATIP http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d72f2c99a576f2ac9f2de56aa44467f0f0af25b --- NEWS |1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index f2742e6..2aa359b 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,7 @@ Access: * New UPnP access module, to list directories without infinite recursions * New WASAPI audio capture module on Windows * SMB/FTP/SFTP accesses can list directories + * Support for SATIP server dialect for RTSP (satip://) Decoder: * OMX GPU-zerocopy support for decoding and display on Android using OpenMax IL ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] live555: Add satip support
vlc | branch: master | Julian Scheel jul...@jusst.de | Thu Jun 18 17:33:58
2015 +0200| [8d0b0e89493bfebe5de2e7c927cf0ba0f22382fb] | committer:
Jean-Baptiste Kempf
live555: Add satip support
Register a satip-access, which uses a hardcoded default SDP dataset instead of
querying it via DESCRIBE. While some SATIP servers implement a common
DESCRIBE the spec is allowing servers to only support DESCRIBE of already
configured sessions, which requires SETUP to be executed before DESCRIBE can
be used at all.
Signed-off-by: Julian Scheel jul...@jusst.de
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d0b0e89493bfebe5de2e7c927cf0ba0f22382fb
---
modules/access/live555.cpp | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 4b84e8e..3e10492 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -102,7 +102,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_(RTSP/RTP access and demux) )
-add_shortcut( rtsp, pnm, live, livedotcom )
+add_shortcut( rtsp, pnm, live, livedotcom, satip )
set_capability( access_demux, 0 )
set_callbacks( Open, Close )
add_bool( rtsp-tcp, false,
@@ -332,6 +332,17 @@ static int Open ( vlc_object_t *p_this )
while( (p = strchr( p, ' ' )) != NULL ) *p = '+';
}
+if( strcasecmp( p_demux-psz_access, satip ) == 0 )
+{
+asprintf(p_sys-p_sdp, v=0\r\n
+o=- 0 %s\r\n
+s=SATIP:stream\r\n
+i=SATIP RTP Stream\r\n
+m=video 0 RTP/AVP 33\r\n
+a=control:rtsp://%s\r\n\r\n,
+p_sys-url.psz_host, p_sys-psz_path);
+}
+
if( p_demux-s != NULL )
{
/* Gather the complete sdp file */
@@ -524,7 +535,15 @@ static void continueAfterOPTIONS( RTSPClient* client, int
result_code,
result_code == 0
result_string != NULL
strstr( result_string, GET_PARAMETER ) != NULL;
-client-sendDescribeCommand( continueAfterDESCRIBE );
+if( p_sys-p_sdp == NULL )
+{
+client-sendDescribeCommand( continueAfterDESCRIBE );
+}
+else
+{
+p_sys-b_error = false;
+p_sys-event_rtsp = 1;
+}
delete[] result_string;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] live555: Use OPTIONS as keep-alive fallback
vlc | branch: master | Julian Scheel jul...@jusst.de | Thu Jun 18 17:33:59
2015 +0200| [30dd905e51508e300e30adc06c5167a3b7a62f16] | committer:
Jean-Baptiste Kempf
live555: Use OPTIONS as keep-alive fallback
So far no keep-alive messages are sent when GET_PARAMETERS is not supported by
the server. Change this to fall back to sending OPTIONS as keep-alive message,
which is the default keep-alive message in the SATIP specification. As
RFC2326 does not enforce a specific command as keep-alive message this shall
be valid for any compliant RTSP server.
Signed-off-by: Julian Scheel jul...@jusst.de
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=30dd905e51508e300e30adc06c5167a3b7a62f16
---
modules/access/live555.cpp | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 3e10492..acd6250 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -1228,9 +1228,9 @@ static int Play( demux_t *p_demux )
if( p_sys-i_timeout = 0 )
p_sys-i_timeout = 60; /* default value from RFC2326 */
-/* start timeout-thread only if GET_PARAMETER is supported by the
server */
-/* or start it if wmserver dialect, since they don't report that
GET_PARAMETER is supported correctly */
-if( !p_sys-p_timeout ( p_sys-b_get_param || var_InheritBool(
p_demux, rtsp-wmserver ) ) )
+/* start timeout-thread. GET_PARAMETER will be used if supported by
+ * the server. OPTIONS will be used as a fallback */
+if( !p_sys-p_timeout )
{
msg_Dbg( p_demux, We have a timeout of %d seconds,
p_sys-i_timeout );
p_sys-p_timeout = (timeout_thread_t *)malloc(
sizeof(timeout_thread_t) );
@@ -1279,7 +1279,13 @@ static int Demux( demux_t *p_demux )
if( p_sys-b_timeout_call p_sys-rtsp p_sys-ms )
{
char *psz_bye = NULL;
-p_sys-rtsp-sendGetParameterCommand( *p_sys-ms, NULL, psz_bye );
+/* Use GET_PARAMETERS if supported. wmserver dialect supports
+ * it, but does not report this properly. */
+if( p_sys-b_get_param || var_GetBool( p_demux, rtsp-wmserver ) )
+p_sys-rtsp-sendGetParameterCommand( *p_sys-ms, NULL, psz_bye );
+else
+p_sys-rtsp-sendOptionsCommand(NULL, NULL);
+
p_sys-b_timeout_call = false;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Contribs: update live555
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Mon Jun 22
11:02:43 2015 +0200| [fd0a69dff784a32dbf6b7f88e0c589d31ea9198d] | committer:
Jean-Baptiste Kempf
Contribs: update live555
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fd0a69dff784a32dbf6b7f88e0c589d31ea9198d
---
contrib/src/live555/SHA512SUMS |2 +-
contrib/src/live555/live555-nosignal.patch | 50 +---
contrib/src/live555/rules.mak |6 ++--
3 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/contrib/src/live555/SHA512SUMS b/contrib/src/live555/SHA512SUMS
index 82d144f..7ae2a1b 100644
--- a/contrib/src/live555/SHA512SUMS
+++ b/contrib/src/live555/SHA512SUMS
@@ -1 +1 @@
-613450ced9bd656bc3e736ce8bae7f867e0c1577c8bdb29369620c3b1772d76e45ce3b8218bf99819c593ac7b92a6760500923c22d32b393f88da7044066
live.2014.07.25.tar.gz
+8446dfe07793bf2ef2db231bca0ef2aa49890703fd3efa857c24d5f0774216b52a981c8683bdaf796983af89286ef579da1b4e828ed1bd62a2e2b3ab7d3f93ac
live.2015.06.21.tar.gz
diff --git a/contrib/src/live555/live555-nosignal.patch
b/contrib/src/live555/live555-nosignal.patch
index 424b168..71c8c33 100644
--- a/contrib/src/live555/live555-nosignal.patch
+++ b/contrib/src/live555/live555-nosignal.patch
@@ -2,28 +2,6 @@ Copyright (C) 2015 Rémi Denis-Courmont
Licensed under the terms of the GNU LGPL version 2.1 or later.
-diff -ru live555.orig/groupsock/GroupsockHelper.cpp
live555/groupsock/GroupsockHelper.cpp
live555.orig/groupsock/GroupsockHelper.cpp 2015-05-21 20:34:45.854307019
+0300
-+++ live555/groupsock/GroupsockHelper.cpp 2015-05-21 20:36:36.003306022
+0300
-@@ -30,6 +30,9 @@
- #define initializeWinsockIfNecessary() 1
- #endif
- #include stdio.h
-+#ifndef MSG_NOSIGNAL
-+# define MSG_NOSIGNAL 0
-+#endif
-
- // By default, use INADDR_ANY for the sending and receiving interfaces:
- netAddressBits SendingInterfaceAddr = INADDR_ANY;
-@@ -337,7 +340,7 @@
- unsigned char* buffer, unsigned bufferSize) {
- do {
- MAKE_SOCKADDR_IN(dest, address.s_addr, port.num());
--int bytesSent = sendto(socket, (char*)buffer, bufferSize, 0,
-+int bytesSent = sendto(socket, (char*)buffer, bufferSize, MSG_NOSIGNAL,
- (struct sockaddr*)dest, sizeof dest);
- if (bytesSent != (int)bufferSize) {
- char tmpBuf[100];
diff -ru live555.orig/liveMedia/RTPInterface.cpp
live555/liveMedia/RTPInterface.cpp
--- live555.orig/liveMedia/RTPInterface.cpp2015-05-21 20:34:45.855307019
+0300
+++ live555/liveMedia/RTPInterface.cpp 2015-05-21 20:38:10.383305167 +0300
@@ -117,13 +95,33 @@ diff -ru
live555.orig/liveMedia/RTSPServerSupportingHTTPStreaming.cpp live555/li
fResponseBuffer[0] = '\0'; // We've already sent the response. This tells
the calling code not to send it again.
// Then, send the playlist. Because it's large, we don't do so using
send(), because that might not send it all at once.
-diff -ru live555.orig/liveMedia/TCPStreamSink.cpp
live555/liveMedia/TCPStreamSink.cpp
live555.orig/liveMedia/TCPStreamSink.cpp 2015-05-21 20:34:45.857307019
+0300
-+++ live555/liveMedia/TCPStreamSink.cpp2015-05-21 20:39:34.599304405
+0300
+--- live/groupsock/GroupsockHelper.cpp.orig2015-06-22 00:09:17.0
+0200
live/groupsock/GroupsockHelper.cpp 2015-06-22 10:56:08.673912904 +0200
+@@ -35,6 +35,9 @@
+ #define USE_SIGNALS 1
+ #endif
+ #include stdio.h
++#ifndef MSG_NOSIGNAL
++# define MSG_NOSIGNAL 0
++#endif
+
+ // By default, use INADDR_ANY for the sending and receiving interfaces:
+ netAddressBits SendingInterfaceAddr = INADDR_ANY;
+@@ -342,7 +345,7 @@
+ unsigned char* buffer, unsigned bufferSize) {
+ do {
+ MAKE_SOCKADDR_IN(dest, address.s_addr, portNum);
+-int bytesSent = sendto(socket, (char*)buffer, bufferSize, 0,
++int bytesSent = sendto(socket, (char*)buffer, bufferSize, MSG_NOSIGNAL,
+ (struct sockaddr*)dest, sizeof dest);
+ if (bytesSent != (int)bufferSize) {
+ char tmpBuf[100];
+--- live/liveMedia/TCPStreamSink.cpp.orig 2015-06-22 00:09:17.0
+0200
live/liveMedia/TCPStreamSink.cpp 2015-06-22 11:01:32.669268927 +0200
@@ -20,6 +20,9 @@
#include TCPStreamSink.hh
- #include RTSPCommon.hh // for ignoreSigPipeOnSocket()
+ #include GroupsockHelper.hh // for ignoreSigPipeOnSocket()
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL 0
+#endif
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 7d9afcf..15fcb0b 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,8 +1,8 @@
# live555
-#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/live555-latest.tar.gz
-LIVE555_FILE := live.2014.07.25.tar.gz
-LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE)
+LIVE555_FILE := live.2015.06.21.tar.gz
+LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
+#LIVEDOTCOM_URL :=
[vlc-commits] android: merge android_surface with android_window
vlc | branch: master | Thomas Guillem tho...@gllm.fr | Mon Jun 22 15:36:44 2015 +0200| [918ed4d12d965a6effd6be94b79b4b9f33d718c7] | committer: Thomas Guillem android: merge android_surface with android_window This commits remove the android_surface module. The old android surface API is now used by the android_window module via native_window_api_t. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=918ed4d12d965a6effd6be94b79b4b9f33d718c7 --- configure.ac | 10 - modules/MODULES_LIST |1 - modules/video_output/Makefile.am |7 - modules/video_output/android/android_window.c | 51 ++- modules/video_output/android/surface.c| 433 - modules/video_output/android/utils.c | 172 -- modules/video_output/android/utils.h | 24 +- po/POTFILES.in|1 - 8 files changed, 200 insertions(+), 499 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=918ed4d12d965a6effd6be94b79b4b9f33d718c7 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Remove using namespace std; from C++ code
vlc | branch: master | Hugo Beauzée-Luyssen h...@beauzee.fr | Mon Jun 22 15:16:16 2015 +0200| [e026c01889b100b97cd33c8a485b7ec173cf82eb] | committer: Hugo Beauzée-Luyssen Remove using namespace std; from C++ code This prevents us from providing our atomic types definitions, as they would conflict with the ones in std:: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e026c01889b100b97cd33c8a485b7ec173cf82eb --- modules/access/dcp/dcp.cpp | 11 +- modules/access/dshow/access.h |1 - modules/access/dshow/dshow.cpp | 40 +- modules/access/dshow/filter.cpp|2 +- modules/access/dshow/filter.h |5 +- modules/access/dtv/bdagraph.hpp|2 - modules/access/live555.cpp |2 - .../adaptative/playlist/SegmentInformation.cpp |9 +- modules/demux/mkv/matroska_segment.cpp |6 +- modules/demux/mkv/matroska_segment_parse.cpp | 10 +- modules/demux/mkv/mkv.cpp |2 +- modules/demux/mkv/mkv.hpp |1 - modules/gui/qt4/menus.hpp |2 - modules/gui/skins2/commands/async_queue.cpp|2 +- modules/gui/skins2/commands/async_queue.hpp|2 +- modules/gui/skins2/commands/cmd_add_item.hpp |6 +- modules/gui/skins2/commands/cmd_audio.hpp |2 +- modules/gui/skins2/commands/cmd_callbacks.hpp |8 +- modules/gui/skins2/commands/cmd_change_skin.hpp|6 +- modules/gui/skins2/commands/cmd_dialogs.hpp|4 +- modules/gui/skins2/commands/cmd_generic.hpp|6 +- modules/gui/skins2/commands/cmd_layout.hpp |2 +- modules/gui/skins2/commands/cmd_minimize.hpp |4 +- modules/gui/skins2/commands/cmd_muxer.hpp |4 +- modules/gui/skins2/commands/cmd_on_top.hpp |2 +- modules/gui/skins2/commands/cmd_playlist.cpp |6 +- modules/gui/skins2/commands/cmd_playlist.hpp | 20 +- modules/gui/skins2/commands/cmd_playtree.hpp |2 +- modules/gui/skins2/commands/cmd_resize.hpp |6 +- modules/gui/skins2/commands/cmd_show_window.hpp|8 +- modules/gui/skins2/commands/cmd_vars.hpp | 16 +- modules/gui/skins2/controls/ctrl_button.hpp|2 +- modules/gui/skins2/controls/ctrl_checkbox.hpp |2 +- modules/gui/skins2/controls/ctrl_generic.cpp |4 +- modules/gui/skins2/controls/ctrl_generic.hpp |2 +- modules/gui/skins2/controls/ctrl_image.cpp |4 +- modules/gui/skins2/controls/ctrl_image.hpp |2 +- modules/gui/skins2/controls/ctrl_list.cpp | 16 +- modules/gui/skins2/controls/ctrl_list.hpp |2 +- modules/gui/skins2/controls/ctrl_move.hpp |2 +- modules/gui/skins2/controls/ctrl_radialslider.hpp |2 +- modules/gui/skins2/controls/ctrl_resize.hpp|2 +- modules/gui/skins2/controls/ctrl_slider.cpp|4 +- modules/gui/skins2/controls/ctrl_slider.hpp|4 +- modules/gui/skins2/controls/ctrl_text.cpp |6 +- modules/gui/skins2/controls/ctrl_text.hpp |2 +- modules/gui/skins2/controls/ctrl_tree.cpp | 22 +- modules/gui/skins2/controls/ctrl_tree.hpp |2 +- modules/gui/skins2/controls/ctrl_video.hpp |2 +- modules/gui/skins2/events/evt_dragndrop.hpp| 16 +- modules/gui/skins2/events/evt_enter.hpp|2 +- modules/gui/skins2/events/evt_focus.hpp|2 +- modules/gui/skins2/events/evt_generic.hpp |2 +- modules/gui/skins2/events/evt_input.cpp|4 +- modules/gui/skins2/events/evt_input.hpp|2 +- modules/gui/skins2/events/evt_key.cpp |6 +- modules/gui/skins2/events/evt_key.hpp |2 +- modules/gui/skins2/events/evt_leave.hpp|2 +- modules/gui/skins2/events/evt_menu.hpp |2 +- modules/gui/skins2/events/evt_motion.hpp |2 +- modules/gui/skins2/events/evt_mouse.cpp|4 +- modules/gui/skins2/events/evt_mouse.hpp|2 +- modules/gui/skins2/events/evt_refresh.hpp |2 +- modules/gui/skins2/events/evt_scroll.cpp |4 +- modules/gui/skins2/events/evt_scroll.hpp |2 +- modules/gui/skins2/events/evt_special.cpp |4 +- modules/gui/skins2/events/evt_special.hpp |2 +- modules/gui/skins2/parser/builder.cpp | 66 ++-- modules/gui/skins2/parser/builder.hpp | 16 +- modules/gui/skins2/parser/builder_data.hpp | 412 ++-- modules/gui/skins2/parser/expr_evaluator.cpp | 18 +- modules/gui/skins2/parser/expr_evaluator.hpp |8 +- modules/gui/skins2/parser/interpreter.cpp | 70 ++--
[vlc-commits] Fix warning on all c++ files
vlc | branch: master | Hugo Beauzée-Luyssen h...@beauzee.fr | Mon Jun 22
15:51:11 2015 +0200| [59678ec0b489d86f6f62cc987e21a82346f8da42] | committer:
Hugo Beauzée-Luyssen
Fix warning on all c++ files
Since vlc_atomic_float is only used for C files, another option would be
to disable this block when building in C++ mode.
Related to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64658
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=59678ec0b489d86f6f62cc987e21a82346f8da42
---
include/vlc_atomic.h |5 +
1 file changed, 5 insertions(+)
diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index 72590c8..a652391 100644
--- a/include/vlc_atomic.h
+++ b/include/vlc_atomic.h
@@ -115,7 +115,12 @@ static inline void vlc_atomic_init_float(vlc_atomic_float
*var, float f)
{
union { float f; uint32_t i; } u;
u.f = f;
+#if defined(__cplusplus) defined(HAVE_CXX11)
+vlc_atomic_float a(u.i)
+*var = a;
+#else
atomic_init(var, u.i);
+#endif
}
/** Helper to retrieve a single precision from an atom. */
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
