[vlc-commits] Qt: be compatible with Qt5
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu Feb 27
16:09:41 2014 +0100| [8b6da64add272b62718055a39827bb6b3cb36627] | committer:
Jean-Baptiste Kempf
Qt: be compatible with Qt5
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b6da64add272b62718055a39827bb6b3cb36627
---
modules/gui/qt4/dialogs/plugins.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gui/qt4/dialogs/plugins.cpp
b/modules/gui/qt4/dialogs/plugins.cpp
index 666fd37..d2bb5c0 100644
--- a/modules/gui/qt4/dialogs/plugins.cpp
+++ b/modules/gui/qt4/dialogs/plugins.cpp
@@ -307,7 +307,7 @@ static QPixmap hueRotate( QImage image, const QColor
source, const QColor targ
{
int distance = target.hue() - source.hue();
/* must be indexed as we alter palette, not a whole pic */
-Q_ASSERT( image.numColors() );
+Q_ASSERT( image.colorCount() );
if ( target.isValid() )
{
/* color 1 = transparency */
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] DCP: update authors
vlc | branch: master | Valentin Vetter vvet...@outlook.com | Thu Feb 27 16:09:27 2014 +0100| [bcfbeb1b275360490f956341b264295169665fa1] | committer: Jean-Baptiste Kempf DCP: update authors Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bcfbeb1b275360490f956341b264295169665fa1 --- modules/access/dcp/dcp.cpp |5 + modules/access/dcp/dcpparser.cpp |5 + modules/access/dcp/dcpparser.h |5 + 3 files changed, 15 insertions(+) diff --git a/modules/access/dcp/dcp.cpp b/modules/access/dcp/dcp.cpp index 9b6d4d2..7960c6e 100644 --- a/modules/access/dcp/dcp.cpp +++ b/modules/access/dcp/dcp.cpp @@ -5,6 +5,11 @@ * Nicolas Bertrand n...@isf.cc * Simona-Marinela Prodea simona dot marinela dot prodea at gmail dot com * Jean-Baptiste Kempf j...@videolan.org + * Guillaume Gonnaud + * Valentin Vetter vvet...@outlook.com + * Anthony Giniers + * Ludovic Hoareau + * Loukmane Dessai * Pierre Villard pierre dot villard dot fr at gmail dot com * Claire Etienne * Aurélie Sbinné diff --git a/modules/access/dcp/dcpparser.cpp b/modules/access/dcp/dcpparser.cpp index 8e43104..cd42922 100644 --- a/modules/access/dcp/dcpparser.cpp +++ b/modules/access/dcp/dcpparser.cpp @@ -4,6 +4,11 @@ * Authors: * Nicolas Bertrand n...@isf.cc * Jean-Baptiste Kempf j...@videolan.org + * Guillaume Gonnaud + * Valentin Vetter vvet...@outlook.com + * Anthony Giniers + * Ludovic Hoareau + * Loukmane Dessai * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by diff --git a/modules/access/dcp/dcpparser.h b/modules/access/dcp/dcpparser.h index 531fd66..32059f5 100644 --- a/modules/access/dcp/dcpparser.h +++ b/modules/access/dcp/dcpparser.h @@ -3,6 +3,11 @@ * * Authors: Nicolas Bertrand n...@isf.cc * Jean-Baptiste Kempf j...@videolan.org + * Guillaume Gonnaud + * Valentin Vetter vvet...@outlook.com + * Anthony Giniers + * Ludovic Hoareau + * Loukmane Dessai * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32: use visible dimensions for all vouts
vlc | branch: master | Felix Abecassis felix.abecas...@gmail.com | Wed Feb 26
17:33:38 2014 +| [93ae604cedff323a5d6ed33548fd53a36b3ab9e6] | committer:
Jean-Baptiste Kempf
Win32: use visible dimensions for all vouts
Close #9645
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=93ae604cedff323a5d6ed33548fd53a36b3ab9e6
---
modules/video_output/msw/common.c |8
modules/video_output/msw/direct2d.c |4 ++--
modules/video_output/msw/direct3d.c | 10 +-
modules/video_output/msw/directx.c |4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/video_output/msw/common.c
b/modules/video_output/msw/common.c
index f4954b1..529db39 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -213,7 +213,7 @@ int CommonUpdatePicture(picture_t *picture, picture_t
**fallback,
/* fill in buffer info in first plane */
picture-p-p_pixels = data;
picture-p-i_pitch = pitch;
-picture-p-i_lines = picture-format.i_height;
+picture-p-i_lines = picture-format.i_visible_height;
/* Fill chroma planes for planar YUV */
if (picture-format.i_chroma == VLC_CODEC_I420 ||
@@ -226,7 +226,7 @@ int CommonUpdatePicture(picture_t *picture, picture_t
**fallback,
p-p_pixels = o-p_pixels + o-i_lines * o-i_pitch;
p-i_pitch = pitch / 2;
-p-i_lines = picture-format.i_height / 2;
+p-i_lines = picture-format.i_visible_height / 2;
}
/* The dx/d3d buffer is always allocated as YV12 */
if (vlc_fourcc_AreUVPlanesSwapped(picture-format.i_chroma,
VLC_CODEC_YV12)) {
@@ -403,8 +403,8 @@ void UpdateRects(vout_display_t *vd,
/* src image dimensions */
rect_src.left = 0;
rect_src.top= 0;
-rect_src.right = source-i_width;
-rect_src.bottom = source-i_height;
+rect_src.right = source-i_visible_width;
+rect_src.bottom = source-i_visible_height;
/* Clip the source image */
rect_src_clipped.left = source-i_x_offset +
diff --git a/modules/video_output/msw/direct2d.c
b/modules/video_output/msw/direct2d.c
index 6f5b28a..6fad178 100644
--- a/modules/video_output/msw/direct2d.c
+++ b/modules/video_output/msw/direct2d.c
@@ -347,8 +347,8 @@ static int D2D_CreateRenderTarget(vout_display_t *vd)
};
D2D1_SIZE_U bitmap_size = {
-vd-fmt.i_width,
-vd-fmt.i_height
+vd-fmt.i_visible_width,
+vd-fmt.i_visible_height
};
hr = ID2D1HwndRenderTarget_CreateBitmap(sys-d2_render_target,
diff --git a/modules/video_output/msw/direct3d.c
b/modules/video_output/msw/direct3d.c
index ff0f601..059c6d6 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -972,8 +972,8 @@ static int Direct3DCreatePool(vout_display_t *vd,
video_format_t *fmt)
/* Create a surface */
LPDIRECT3DSURFACE9 surface;
HRESULT hr = IDirect3DDevice9_CreateOffscreenPlainSurface(d3ddev,
- fmt-i_width,
- fmt-i_height,
+
fmt-i_visible_width,
+
fmt-i_visible_height,
d3dfmt-format,
D3DPOOL_DEFAULT,
surface,
@@ -996,7 +996,7 @@ static int Direct3DCreatePool(vout_display_t *vd,
video_format_t *fmt)
picture_resource_t resource = { .p_sys = picsys };
for (int i = 0; i PICTURE_PLANE_MAX; i++)
-resource.p[i].i_lines = fmt-i_height / (i 0 ? 2 : 1);
+resource.p[i].i_lines = fmt-i_visible_height / (i 0 ? 2 : 1);
picture_t *picture = picture_NewFromResource(fmt, resource);
if (!picture) {
@@ -1055,8 +1055,8 @@ static int Direct3DCreateScene(vout_display_t *vd, const
video_format_t *fmt)
*/
LPDIRECT3DTEXTURE9 d3dtex;
hr = IDirect3DDevice9_CreateTexture(d3ddev,
-fmt-i_width,
-fmt-i_height,
+fmt-i_visible_width,
+fmt-i_visible_height,
1,
D3DUSAGE_RENDERTARGET,
sys-d3dpp.BackBufferFormat,
diff --git a/modules/video_output/msw/directx.c
b/modules/video_output/msw/directx.c
index b65b145..4832fd0 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -850,8 +850,8 @@ static int DirectXCreateSurface(vout_display_t *vd,
ddsd.dwSize = sizeof(ddsd);
ddsd.ddpfPixelFormat.dwSize =
[vlc-commits] DCP: allow to pause
vlc | branch: master | Valentin Vetter vvet...@outlook.com | Thu Feb 27 16:08:55 2014 +0100| [9a67cfe89bf7d78be3932dacebdf04e78baf94fc] | committer: Jean-Baptiste Kempf DCP: allow to pause Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a67cfe89bf7d78be3932dacebdf04e78baf94fc --- modules/access/dcp/dcp.cpp |3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/access/dcp/dcp.cpp b/modules/access/dcp/dcp.cpp index 578ac91..9b6d4d2 100644 --- a/modules/access/dcp/dcp.cpp +++ b/modules/access/dcp/dcp.cpp @@ -754,6 +754,9 @@ static int Control( demux_t *p_demux, int query, va_list args ) *pb = false; break; +case DEMUX_SET_PAUSE_STATE: +return VLC_SUCCESS; + case DEMUX_GET_POSITION: pf = ( double* ) va_arg ( args, double* ); if( p_sys-frames_total != 0 ) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] configure: add -Zhigh-mem linker flag for OS/2
vlc/vlc-2.1 | branch: master | KO Myung-Hun kom...@gmail.com | Thu Feb 27
13:06:58 2014 +0900| [c71b207b04868a41dd7bba993f67eedd57d81a69] | committer:
Jean-Baptiste Kempf
configure: add -Zhigh-mem linker flag for OS/2
When converting 1920x1080p mp4 using x264, x264 complains that it failed
to allocate memory. This flags makes it happy.
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 7898d4241673aa94a7ec0267314a454853fd2522)
Signed-off-by: KO Myung-Hun k...@chollian.net
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=c71b207b04868a41dd7bba993f67eedd57d81a69
---
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 858dbfd..a684338 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,7 +266,7 @@ case ${host_os} in
;;
*os2*)
SYS=os2
-LDFLAGS=${LDFLAGS} -Zomf -Zbin-files -Zargs-wild
+LDFLAGS=${LDFLAGS} -Zomf -Zbin-files -Zargs-wild -Zhigh-mem
;;
*)
SYS=${host_os}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] os2: make high-memory safe
vlc/vlc-2.1 | branch: master | KO Myung-Hun kom...@gmail.com | Thu Feb 27
13:06:59 2014 +0900| [e18f9e96eb6de52f2f9637f1535fbcc375d37f8b] | committer:
Jean-Baptiste Kempf
os2: make high-memory safe
Some OS/2 APIs are not high-memory safe. So there are needs to use wrapper
functions to make them high-memory safe.
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
(cherry picked from commit 8a62913aa35ed91c415c531ad7d5876e75b6dc1b)
Signed-off-by: KO Myung-Hun k...@chollian.net
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=e18f9e96eb6de52f2f9637f1535fbcc375d37f8b
---
include/vlc_common.h |1 +
modules/access/vcd/cdrom.c | 56
2 files changed, 57 insertions(+)
diff --git a/include/vlc_common.h b/include/vlc_common.h
index 6116f8e..3292423 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -408,6 +408,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /*
variable's object */
# define OS2EMX_PLAIN_CHAR
# define INCL_BASE
# define INCL_PM
+# include os2safe.h
# include os2.h
#endif
diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index 17ce5ed..f0952d3 100644
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -80,7 +80,63 @@
# include sys/ioctl.h
# include linux/cdrom.h
#elif defined( __OS2__ )
+# include os2safe.h
# include os2.h
+
+/*
+ * vlc_DosDevIOCtl: high memory safe wrapper for DosDevIOCtl
+ *
+ * Unfortunately, DosDevIOCtl() is not high memory safe API, and is not
+ * covered by os2safe.h. So define a wrapper function for it here.
+ */
+
+static APIRET vlc_DosDevIOCtl( HFILE hdevice, ULONG category, ULONG function,
+ PVOID pParams, ULONG cbParamLenMax,
+ PULONG pcbParamLen, PVOID pData,
+ ULONG cbDataLenMax, PULONG pcbDataLen )
+{
+PVOID pParamsLow = NULL;
+PVOID pDataLow = NULL;
+ULONG cbParamLenLow;
+ULONG cbDataLenLow;
+
+APIRET rc;
+
+rc = DosAllocMem( pParamsLow, cbParamLenMax, fALLOC );
+if( rc )
+goto exit_free;
+
+rc = DosAllocMem( pDataLow, cbDataLenMax, fALLOC );
+if( rc )
+goto exit_free;
+
+memcpy( pParamsLow, pParams, cbParamLenMax );
+memcpy( pDataLow, pData, cbDataLenMax );
+
+cbParamLenLow = *pcbParamLen;
+cbDataLenLow = *pcbDataLen;
+
+rc = DosDevIOCtl( hdevice, category, function, pParamsLow,
+ cbParamLenMax, cbParamLenLow, pDataLow, cbDataLenMax,
+ cbDataLenLow );
+
+if( !rc )
+{
+memcpy( pParams, pParamsLow, cbParamLenMax );
+memcpy( pData, pDataLow, cbDataLenMax );
+
+*pcbParamLen = cbParamLenLow;
+*pcbDataLen = cbDataLenLow;
+}
+
+exit_free:
+DosFreeMem( pParamsLow);
+DosFreeMem( pDataLow);
+
+return rc;
+}
+
+# define DosDevIOCtl vlc_DosDevIOCtl
#else
# error FIXME
#endif
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avcodec: remove the VLC DSP mask (except on Android on ARM)
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Sat Feb 22
19:25:59 2014 +0200| [8512cab6af819bf0223d74feffc862e6c162c89d] | committer:
Rémi Denis-Courmont
avcodec: remove the VLC DSP mask (except on Android on ARM)
libavutil will always check for all CPU features that it understands,
even those VLC masked. Thus masking features provides no savings.
libavutil runs more tests than VLC. Depending on the platform and
operating system combination, libavutil is either as conservative or
more conservative than VLC. As such masking features provides no extra
safety.
So overall, GetVlcDspMask() is useless, at least nowadays.
Android ARM NEON seems controversial so it is kept for now.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8512cab6af819bf0223d74feffc862e6c162c89d
---
modules/access/Makefile.am |2 +-
modules/codec/Makefile.am|1 -
modules/codec/avcodec/avcodec.c |5 --
modules/codec/avcodec/avcommon.h |9 ++--
modules/codec/avcodec/cpu.c | 93 --
modules/codec/avcodec/encoder.c |5 --
modules/demux/Makefile.am|1 -
7 files changed, 5 insertions(+), 111 deletions(-)
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 8b0fd08..a8677db 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -409,7 +409,7 @@ libaccess_realrtsp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath
'$(accessdir)'
access_LTLIBRARIES += $(LTLIBaccess_realrtsp)
EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la
-libavio_plugin_la_SOURCES = access/avio.c access/avio.h codec/avcodec/cpu.c
+libavio_plugin_la_SOURCES = access/avio.c access/avio.h
libavio_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
libavio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
libavio_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 8535bac..e013263 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -244,7 +244,6 @@ libavcodec_plugin_la_SOURCES = \
codec/avcodec/video.c \
codec/avcodec/subtitle.c \
codec/avcodec/audio.c \
- codec/avcodec/cpu.c \
codec/avcodec/fourcc.c \
codec/avcodec/chroma.c codec/avcodec/chroma.h \
codec/avcodec/va.c codec/avcodec/va.h \
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 956c72b..0695257 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -301,11 +301,6 @@ static int OpenDecoder( vlc_object_t *p_this )
p_context-debug = var_InheritInteger( p_dec, avcodec-debug );
p_context-opaque = (void *)p_this;
-/* set CPU capabilities */
-#if !LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
-p_context-dsp_mask = GetVlcDspMask();
-#endif
-
p_dec-b_need_packetized = true;
switch( i_cat )
{
diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index 61fc609..7610456 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -36,8 +36,6 @@
#include avcommon_compat.h
-unsigned GetVlcDspMask(void);
-
#ifdef HAVE_LIBAVUTIL_AVUTIL_H
# include libavutil/avutil.h
# include libavutil/dict.h
@@ -83,9 +81,10 @@ static inline void vlc_init_avutil(vlc_object_t *obj)
av_log_set_level(level);
-#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
-av_set_cpu_flags_mask( INT_MAX ~GetVlcDspMask() );
-#endif
+# if defined (__arm__) defined (__ANDROID__)
+if (!vlc_CPU_ARM_NEON())
+av_set_cpu_flags(AV_CPU_FLAG_NEON);
+# endif
msg_Dbg(obj, CPU flags: 0x%08x, av_get_cpu_flags());
}
#endif
diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c
deleted file mode 100644
index 29726c1..000
--- a/modules/codec/avcodec/cpu.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * cpu.c: CPU capabilities for libavcodec
- *
- * Copyright (C) 1999-2012 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-
[vlc-commits] vdpau_avcodec: remove development versions support
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Thu Feb 27
18:33:57 2014 +0200| [5bf612e9bdd7e4a2ac766df9936cc9089f5c3fb2] | committer:
Rémi Denis-Courmont
vdpau_avcodec: remove development versions support
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5bf612e9bdd7e4a2ac766df9936cc9089f5c3fb2
---
modules/hw/vdpau/avcodec.c |7 ---
1 file changed, 7 deletions(-)
diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index 7081dee..ad8c21b 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -151,9 +151,6 @@ static void Deinit(vlc_va_t *va)
assert(sys-context-decoder != VDP_INVALID_HANDLE);
vdp_decoder_destroy(sys-vdp, sys-context-decoder);
-#if (LIBAVCODEC_VERSION_INT AV_VERSION_INT(55, 13, 0))
-av_freep(sys-context-bitstream_buffers);
-#endif
}
static int Setup(vlc_va_t *va, void **ctxp, vlc_fourcc_t *chromap,
@@ -279,11 +276,7 @@ static int Open(vlc_va_t *va, int codec, const es_format_t
*fmt)
if (unlikely(sys == NULL))
return VLC_ENOMEM;
-#if (LIBAVCODEC_VERSION_INT = AV_VERSION_INT(55, 26, 0))
sys-context = av_vdpau_alloc_context();
-#else
-sys-context = calloc(1, sizeof (*sys-context));
-#endif
if (unlikely(sys-context == NULL))
{
free(sys);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: fix possible free() of static const char[]
vlc | branch: master | Jerome Forissier jer...@taodyne.com | Thu Feb 27
16:53:24 2014 +0100| [c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a] | committer:
Rémi Denis-Courmont
libvlc: fix possible free() of static const char[]
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a
---
lib/error.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/error.c b/lib/error.c
index f942f4d..45397a6 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -33,11 +33,17 @@ static vlc_threadvar_t context;
static vlc_mutex_t lock = VLC_STATIC_MUTEX;
static uintptr_t refs = 0;
+static void free_msg (void *msg)
+{
+if (msg != oom)
+free (msg);
+}
+
void libvlc_threads_init (void)
{
vlc_mutex_lock (lock);
if (refs++ == 0)
-vlc_threadvar_create (context, free);
+vlc_threadvar_create (context, free_msg);
vlc_mutex_unlock (lock);
}
@@ -57,9 +63,7 @@ static char *get_error (void)
static void free_error (void)
{
-char *msg = get_error ();
-if (msg != oom)
-free (msg);
+free_msg (get_error ());
}
/**
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] configure: drop old development-only libavcodec versions for VDPAU
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Thu Feb 27
18:33:06 2014 +0200| [cc5dc79ae8ea9613dabf596511772c3711db5266] | committer:
Rémi Denis-Courmont
configure: drop old development-only libavcodec versions for VDPAU
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cc5dc79ae8ea9613dabf596511772c3711db5266
---
configure.ac |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8163b2f..e4be0bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3055,14 +3055,14 @@ AM_CONDITIONAL([HAVE_VDPAU], [test ${have_vdpau} =
yes])
have_avcodec_vdpau=no
AS_IF([test ${have_vdpau} = yes -a ${have_avcodec} = yes], [
- PKG_CHECK_EXISTS([libavutil = 0.52.4 libavcodec = 54.36.0], [
+ PKG_CHECK_EXISTS([libavutil = 0.52.4 libavcodec = 55.26.0], [
have_avcodec_vdpau=yes
AC_MSG_NOTICE([VDPAU decoding acceleration activated])
], [
AS_IF([test -n ${enable_vdpau}], [
- AC_MSG_ERROR([libavutil = 0.52.4 and libavcodec = 54.36.0 are required
for VDPAU decoding.])
+ AC_MSG_ERROR([libavutil = 0.52.4 and libavcodec = 55.26.0 are required
for VDPAU decoding.])
], [
- AC_MSG_WARN([libavutil = 0.52.4 and libavcodec = 54.36.0 are required
for VDPAU decoding.])
+ AC_MSG_WARN([libavutil = 0.52.4 and libavcodec = 55.26.0 are required
for VDPAU decoding.])
])
])
])
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: fix possible free() of static const char[]
vlc/vlc-2.1 | branch: master | Jerome Forissier jer...@taodyne.com | Thu Feb
27 16:53:24 2014 +0100| [ee2540e70e963bba66482edf5022972234731c15] | committer:
Rémi Denis-Courmont
libvlc: fix possible free() of static const char[]
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
(cherry picked from commit c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a)
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ee2540e70e963bba66482edf5022972234731c15
---
lib/error.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/error.c b/lib/error.c
index f942f4d..45397a6 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -33,11 +33,17 @@ static vlc_threadvar_t context;
static vlc_mutex_t lock = VLC_STATIC_MUTEX;
static uintptr_t refs = 0;
+static void free_msg (void *msg)
+{
+if (msg != oom)
+free (msg);
+}
+
void libvlc_threads_init (void)
{
vlc_mutex_lock (lock);
if (refs++ == 0)
-vlc_threadvar_create (context, free);
+vlc_threadvar_create (context, free_msg);
vlc_mutex_unlock (lock);
}
@@ -57,9 +63,7 @@ static char *get_error (void)
static void free_error (void)
{
-char *msg = get_error ();
-if (msg != oom)
-free (msg);
+free_msg (get_error ());
}
/**
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: reorder string functions and add add some documentation
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Thu Feb
27 17:44:44 2014 +0100| [2ec4f0a67afd8b790415a591cc9872647ead7be7] | committer:
David Fuhrmann
macosx: reorder string functions and add add some documentation
No functional change.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ec4f0a67afd8b790415a591cc9872647ead7be7
---
modules/gui/macosx/StringUtility.h |3 +-
modules/gui/macosx/StringUtility.m | 93 +---
2 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/modules/gui/macosx/StringUtility.h
b/modules/gui/macosx/StringUtility.h
index a412ff5..1e34d4a 100644
--- a/modules/gui/macosx/StringUtility.h
+++ b/modules/gui/macosx/StringUtility.h
@@ -47,14 +47,13 @@ unsigned int CocoaKeyToVLC(unichar i_key);
- (NSString *)localizedString:(const char *)psz;
- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
-- (NSString *)OSXStringKeyToString:(NSString *)theString;
- (NSString *)getCurrentTimeAsString:(input_thread_t *)p_input
negative:(BOOL)b_negative;
+- (NSString *)OSXStringKeyToString:(NSString *)theString;
- (NSString *)VLCKeyToString:(NSString *)theString;
- (unsigned int)VLCModifiersToCocoa:(NSString *)theString;
- (NSString *)b64Decode:(NSString *)string;
-
- (NSString *)b64EncodeAndFree:(char *)psz_string;
@end
diff --git a/modules/gui/macosx/StringUtility.m
b/modules/gui/macosx/StringUtility.m
index 1498875..dc9f2cd 100644
--- a/modules/gui/macosx/StringUtility.m
+++ b/modules/gui/macosx/StringUtility.m
@@ -115,44 +115,6 @@ static VLCStringUtility *_o_sharedInstance = nil;
return o_out_string;
}
-- (NSString *)OSXStringKeyToString:(NSString *)theString
-{
-if (![theString isEqualToString:@]) {
-/* remove cruft */
-if ([theString characterAtIndex:([theString length] - 1)] != 0x2b)
-theString = [theString stringByReplacingOccurrencesOfString:@+
withString:@];
-else {
-theString = [theString stringByReplacingOccurrencesOfString:@+
withString:@];
-theString = [NSString stringWithFormat:@%@+, theString];
-}
-if ([theString characterAtIndex:([theString length] - 1)] != 0x2d)
-theString = [theString stringByReplacingOccurrencesOfString:@-
withString:@];
-else {
-theString = [theString stringByReplacingOccurrencesOfString:@-
withString:@];
-theString = [NSString stringWithFormat:@%@-, theString];
-}
-/* modifiers */
-theString = [theString stringByReplacingOccurrencesOfString:@Command
withString: [NSString stringWithUTF8String:\xE2\x8C\x98]];
-theString = [theString stringByReplacingOccurrencesOfString:@Alt
withString: [NSString stringWithUTF8String:\xE2\x8C\xA5]];
-theString = [theString stringByReplacingOccurrencesOfString:@Shift
withString: [NSString stringWithUTF8String:\xE2\x87\xA7]];
-theString = [theString stringByReplacingOccurrencesOfString:@Ctrl
withString: [NSString stringWithUTF8String:\xE2\x8C\x83]];
-/* show non-character keys correctly */
-theString = [theString stringByReplacingOccurrencesOfString:@Right
withString:[NSString stringWithUTF8String:\xE2\x86\x92]];
-theString = [theString stringByReplacingOccurrencesOfString:@Left
withString:[NSString stringWithUTF8String:\xE2\x86\x90]];
-theString = [theString stringByReplacingOccurrencesOfString:@Page Up
withString:[NSString stringWithUTF8String:\xE2\x87\x9E]];
-theString = [theString stringByReplacingOccurrencesOfString:@Page
Down withString:[NSString stringWithUTF8String:\xE2\x87\x9F]];
-theString = [theString stringByReplacingOccurrencesOfString:@Up
withString:[NSString stringWithUTF8String:\xE2\x86\x91]];
-theString = [theString stringByReplacingOccurrencesOfString:@Down
withString:[NSString stringWithUTF8String:\xE2\x86\x93]];
-theString = [theString stringByReplacingOccurrencesOfString:@Enter
withString:[NSString stringWithUTF8String:\xe2\x86\xb5]];
-theString = [theString stringByReplacingOccurrencesOfString:@Tab
withString:[NSString stringWithUTF8String:\xe2\x87\xa5]];
-theString = [theString stringByReplacingOccurrencesOfString:@Delete
withString:[NSString stringWithUTF8String:\xe2\x8c\xab]];/*
capitalize plain characters to suit the menubar's look */
-theString = [theString capitalizedString];
-}
-else
-theString = [NSString stringWithString:_NS(Not Set)];
-return theString;
-}
-
- (NSString *)getCurrentTimeAsString:(input_thread_t *)p_input
negative:(BOOL)b_negative
{
assert(p_input != nil);
@@ -211,6 +173,9 @@ static struct
{0,0}
};
+/*
+ * Takes the first value of an cocoa key string, and converts it to VLCs int
representation.
+ */
unsigned int CocoaKeyToVLC(unichar i_key)
{
unsigned int i;
@@ -223,6 +188,52 @@ unsigned int CocoaKeyToVLC(unichar i_key)
return
[vlc-commits] macosx: do not enforce AR if video view is hidden
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Wed Feb
26 18:30:48 2014 +0100| [4bec749d2a8b362d0be73195ce5916d32920c73f] | committer:
David Fuhrmann
macosx: do not enforce AR if video view is hidden
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4bec749d2a8b362d0be73195ce5916d32920c73f
---
modules/gui/macosx/Windows.m |3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index cad88fd..2c56cc5 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -576,6 +576,9 @@
if (b_in_fullscreen_transition || [self fullscreen])
return proposedFrameSize;
+if ([o_video_view isHidden])
+return proposedFrameSize;
+
if ([[VLCCoreInteraction sharedInstance] aspectRatioIsLocked]) {
NSRect videoWindowFrame = [self frame];
NSRect viewRect = [o_video_view convertRect:[o_video_view bounds]
toView: nil];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix page up / page down hotkey support
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Thu Feb
27 17:25:18 2014 +0100| [8afd622d2c47cdc1f0d7844c6fb192fee55a856f] | committer:
David Fuhrmann
macosx: fix page up / page down hotkey support
close #10716
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8afd622d2c47cdc1f0d7844c6fb192fee55a856f
---
modules/gui/macosx/StringUtility.m | 12 +++-
modules/gui/macosx/simple_prefs.m |4 ++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/gui/macosx/StringUtility.m
b/modules/gui/macosx/StringUtility.m
index 614040c..1498875 100644
--- a/modules/gui/macosx/StringUtility.m
+++ b/modules/gui/macosx/StringUtility.m
@@ -139,6 +139,8 @@ static VLCStringUtility *_o_sharedInstance = nil;
/* show non-character keys correctly */
theString = [theString stringByReplacingOccurrencesOfString:@Right
withString:[NSString stringWithUTF8String:\xE2\x86\x92]];
theString = [theString stringByReplacingOccurrencesOfString:@Left
withString:[NSString stringWithUTF8String:\xE2\x86\x90]];
+theString = [theString stringByReplacingOccurrencesOfString:@Page Up
withString:[NSString stringWithUTF8String:\xE2\x87\x9E]];
+theString = [theString stringByReplacingOccurrencesOfString:@Page
Down withString:[NSString stringWithUTF8String:\xE2\x87\x9F]];
theString = [theString stringByReplacingOccurrencesOfString:@Up
withString:[NSString stringWithUTF8String:\xE2\x86\x91]];
theString = [theString stringByReplacingOccurrencesOfString:@Down
withString:[NSString stringWithUTF8String:\xE2\x86\x93]];
theString = [theString stringByReplacingOccurrencesOfString:@Enter
withString:[NSString stringWithUTF8String:\xe2\x86\xb5]];
@@ -261,7 +263,11 @@ unsigned int CocoaKeyToVLC(unichar i_key)
#pragma GCC diagnostic ignored -Wformat
#endif
if ([theString length] 1) {
-if ([theString rangeOfString:@Up].location != NSNotFound)
+if ([theString rangeOfString:@Page Up].location != NSNotFound)
+return [NSString stringWithFormat:@%C, NSPageUpFunctionKey];
+else if ([theString rangeOfString:@Page Down].location != NSNotFound)
+return [NSString stringWithFormat:@%C, NSPageDownFunctionKey];
+else if ([theString rangeOfString:@Up].location != NSNotFound)
return [NSString stringWithFormat:@%C, NSUpArrowFunctionKey];
else if ([theString rangeOfString:@Down].location != NSNotFound)
return [NSString stringWithFormat:@%C, NSDownArrowFunctionKey];
@@ -277,10 +283,6 @@ unsigned int CocoaKeyToVLC(unichar i_key)
return [NSString stringWithFormat:@%C, NSHomeFunctionKey];
else if ([theString rangeOfString:@End].location != NSNotFound)
return [NSString stringWithFormat:@%C, NSEndFunctionKey];
-else if ([theString rangeOfString:@Pageup].location != NSNotFound)
-return [NSString stringWithFormat:@%C, NSPageUpFunctionKey];
-else if ([theString rangeOfString:@Pagedown].location != NSNotFound)
-return [NSString stringWithFormat:@%C, NSPageDownFunctionKey];
else if ([theString rangeOfString:@Menu].location != NSNotFound)
return [NSString stringWithFormat:@%C, NSMenuFunctionKey];
else if ([theString rangeOfString:@Tab].location != NSNotFound)
diff --git a/modules/gui/macosx/simple_prefs.m
b/modules/gui/macosx/simple_prefs.m
index 082562c..bf9ab4c 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -1585,9 +1585,9 @@ static inline void save_string_list(intf_thread_t *
p_intf, id object, const cha
else if (key == NSEndFunctionKey)
[tempString appendString:@End];
else if (key == NSPageUpFunctionKey)
-[tempString appendString:@Pageup];
+[tempString appendString:@Page Up];
else if (key == NSPageDownFunctionKey)
-[tempString appendString:@Pagedown];
+[tempString appendString:@Page Down];
else if (key == NSMenuFunctionKey)
[tempString appendString:@Menu];
else if (key == NSTabCharacter)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc_internal.h: delete unused function prototypes
vlc | branch: master | Jerome Forissier jer...@taodyne.com | Thu Feb 27 18:59:14 2014 +0100| [99fffd130aacfb01ac6e04740a553e1e79620b8e] | committer: Rémi Denis-Courmont libvlc_internal.h: delete unused function prototypes Signed-off-by: Rémi Denis-Courmont r...@remlab.net http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=99fffd130aacfb01ac6e04740a553e1e79620b8e --- lib/libvlc_internal.h |2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h index 64585a7..4008c53 100644 --- a/lib/libvlc_internal.h +++ b/lib/libvlc_internal.h @@ -88,8 +88,6 @@ struct libvlc_instance_t /* Thread context */ void libvlc_threads_init (void); void libvlc_threads_deinit (void); -void libvlc_log_init (void); -void libvlc_log_deinit (void); /* Events */ libvlc_event_manager_t * libvlc_event_manager_new( ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: fix potentially leaked error message
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Thu Feb 27
20:33:31 2014 +0200| [6ae117da3f1dac3b8fcf950d07abe9c8d61bdcea] | committer:
Rémi Denis-Courmont
libvlc: fix potentially leaked error message
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ae117da3f1dac3b8fcf950d07abe9c8d61bdcea
---
lib/error.c | 27 +++
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/lib/error.c b/lib/error.c
index 45397a6..a86c95b 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -30,8 +30,10 @@ static const char oom[] = Out of memory;
/* TODO: use only one thread-specific key for whole libvlc */
static vlc_threadvar_t context;
-static vlc_mutex_t lock = VLC_STATIC_MUTEX;
-static uintptr_t refs = 0;
+static char *get_error (void)
+{
+return vlc_threadvar_get (context);
+}
static void free_msg (void *msg)
{
@@ -39,6 +41,14 @@ static void free_msg (void *msg)
free (msg);
}
+static void free_error (void)
+{
+free_msg (get_error ());
+}
+
+static vlc_mutex_t lock = VLC_STATIC_MUTEX;
+static uintptr_t refs = 0;
+
void libvlc_threads_init (void)
{
vlc_mutex_lock (lock);
@@ -52,20 +62,13 @@ void libvlc_threads_deinit (void)
vlc_mutex_lock (lock);
assert (refs 0);
if (--refs == 0)
+{
+free_error ();
vlc_threadvar_delete (context);
+}
vlc_mutex_unlock (lock);
}
-static char *get_error (void)
-{
-return vlc_threadvar_get (context);
-}
-
-static void free_error (void)
-{
-free_msg (get_error ());
-}
-
/**
* Gets a human-readable error message for the last LibVLC error in the calling
* thread. The resulting string is valid until another error occurs (at least
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: animators: fix reorder warning
vlc | branch: master | Tristan Matthews le.business...@gmail.com | Thu Feb 27 16:36:33 2014 -0500| [ab870c51419e2e89db872940d1a21823fc2f4251] | committer: Tristan Matthews Qt: animators: fix reorder warning http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab870c51419e2e89db872940d1a21823fc2f4251 --- modules/gui/qt4/util/animators.hpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/qt4/util/animators.hpp b/modules/gui/qt4/util/animators.hpp index 947ac1b..2daee4b 100644 --- a/modules/gui/qt4/util/animators.hpp +++ b/modules/gui/qt4/util/animators.hpp @@ -90,8 +90,8 @@ protected slots: void updateDelegate(); private: -BasicAnimator *animator; QAbstractItemView *view; +BasicAnimator *animator; QPersistentModelIndex index; }; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
