[vlc-commits] flac: use library defined constant
vlc | branch: master | Tristan Matthews | Wed May 24
20:35:04 2017 -0400| [c88a956c6424cd58ab5f8f51c83bdbd246c492d0] | committer:
Tristan Matthews
flac: use library defined constant
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c88a956c6424cd58ab5f8f51c83bdbd246c492d0
---
modules/codec/flac.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 65a78ea772..b53dc8406f 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -75,9 +75,7 @@ struct decoder_sys_t
bool b_stream_info;
};
-#define FLAC_MAX_CHANNELS 8
-
-static const int pi_channels_maps[FLAC_MAX_CHANNELS + 1] =
+static const int pi_channels_maps[FLAC__MAX_CHANNELS + 1] =
{
0,
AOUT_CHAN_CENTER,
@@ -98,7 +96,7 @@ static const int pi_channels_maps[FLAC_MAX_CHANNELS + 1] =
};
/* XXX it supposes our internal format is WG4 */
-static const uint8_t ppi_reorder[1+FLAC_MAX_CHANNELS][FLAC_MAX_CHANNELS] =
+static const uint8_t ppi_reorder[1+FLAC__MAX_CHANNELS][FLAC__MAX_CHANNELS] =
{
{ },
{ 0, },
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_stream_ReadLine: fix trimming
vlc | branch: master | Rémi Denis-Courmont | Wed May 24 22:07:05 2017 +0300| [32ff0bbcada5e6d5c0e92e684b454764241fafa0] | committer: Rémi Denis-Courmont vlc_stream_ReadLine: fix trimming Removal of CR or LF final characters relied on the off-by-one bug fixed in the previous changest, and no longer works. This adjusts it accordingly. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=32ff0bbcada5e6d5c0e92e684b454764241fafa0 --- src/input/stream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/input/stream.c b/src/input/stream.c index a1eb20ec9e..1191e99b3d 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -332,8 +332,9 @@ char *vlc_stream_ReadLine( stream_t *s ) } /* Remove trailing LF/CR */ -while( i_line >= 2 && ( p_line[i_line-2] == '\r' || -p_line[i_line-2] == '\n') ) i_line--; +while( i_line >= 1 && + (p_line[i_line - 1] == '\r' || p_line[i_line - 1] == '\n') ) +i_line--; /* Make sure the \0 is there */ p_line[i_line] = '\0'; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_stream_ReadLine(): improve error reporting
vlc | branch: master | Rémi Denis-Courmont | Wed May 24
19:43:39 2017 +0300| [0379cf77c90da4ecececfc9d3379a969d8736423] | committer:
Rémi Denis-Courmont
vlc_stream_ReadLine(): improve error reporting
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0379cf77c90da4ecececfc9d3379a969d8736423
---
src/input/stream.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/input/stream.c b/src/input/stream.c
index 6045f53cee..e0c70b42cc 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
@@ -322,8 +323,8 @@ char *vlc_stream_ReadLine( stream_t *s )
if( vlc_iconv( priv->text.conv, &p_in, &i_in, &p_out, &i_out ) ==
(size_t)-1 )
{
-msg_Err( s, "iconv failed" );
-msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in,
(int)i_out );
+msg_Err( s, "conversion error: %s", vlc_strerror_c( errno ) );
+msg_Dbg( s, "original: %d, in %zu, out %zu", i_line, i_in,
i_out );
}
free( p_line );
p_line = psz_new_line;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_stream_ReadLine: fix off-by-one
vlc | branch: master | Rémi Denis-Courmont | Wed May 24 19:47:12 2017 +0300| [dbb8a1891fd41938897b66d58aa8b012695d7f30] | committer: Rémi Denis-Courmont vlc_stream_ReadLine: fix off-by-one Do not erase the last converted byte. This bug has apparently existed ever since UTF-16 support was added. If the conversion fails, this bug resulted in a heap underflow (writing zero right before the beginning of the buffer). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dbb8a1891fd41938897b66d58aa8b012695d7f30 --- src/input/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/stream.c b/src/input/stream.c index e0c70b42cc..a1eb20ec9e 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -336,7 +336,7 @@ char *vlc_stream_ReadLine( stream_t *s ) p_line[i_line-2] == '\n') ) i_line--; /* Make sure the \0 is there */ -p_line[i_line-1] = '\0'; +p_line[i_line] = '\0'; return p_line; } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contribs: microdns: Bump to 0.0.7
vlc | branch: master | Hugo Beauzée-Luyssen | Wed May 24 16:06:22 2017 +0200| [3000c773af0e6f7d4bb17db86d2da4f140588a8e] | committer: Hugo Beauzée-Luyssen contribs: microdns: Bump to 0.0.7 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3000c773af0e6f7d4bb17db86d2da4f140588a8e --- contrib/src/microdns/SHA512SUMS | 2 +- contrib/src/microdns/rules.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/microdns/SHA512SUMS b/contrib/src/microdns/SHA512SUMS index fc0c9f6bd8..604e590410 100644 --- a/contrib/src/microdns/SHA512SUMS +++ b/contrib/src/microdns/SHA512SUMS @@ -1 +1 @@ -12fb017312709732bb8295cb6d8e56fef9e311be3c66c8033dcc6b996b2f9f815f3b63c65ad797d5fd9e938960183ea84410b5c9e4e5710aa5198b9dd432db0c microdns-0.0.6.tar.gz +616a9327171f47c18c728383d175e4ec97a07c83a6ddfd69b68d129616d726b47b2cfddd856ccb44e8374d4edb448f2ab0936c54929d9619851323bc79aec0c3 microdns-0.0.7.tar.gz diff --git a/contrib/src/microdns/rules.mak b/contrib/src/microdns/rules.mak index e3ea8a21dd..693d33e73e 100644 --- a/contrib/src/microdns/rules.mak +++ b/contrib/src/microdns/rules.mak @@ -1,6 +1,6 @@ # libmicrodns -LIBMICRODNS_VERSION := 0.0.6 +LIBMICRODNS_VERSION := 0.0.7 LIBMICRODNS_URL := https://github.com/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.gz ifndef HAVE_MACOSX ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "subtitle: Fix potential memory leaks"
vlc/vlc-2.2 | branch: refs/tags/2.2.6 | Hugo Beauzée-Luyssen
| Wed May 24 12:36:19 2017 +0200| [dbe888f9ca9c3b102478b4a16a3d1d985c267899] |
committer: Hugo Beauzée-Luyssen
Revert "subtitle: Fix potential memory leaks"
This reverts commit 85f38701259e07a843a7ee1dd51959151a7bb050.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=dbe888f9ca9c3b102478b4a16a3d1d985c267899
---
modules/demux/subtitle.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index c4402edfb9..3e40f28065 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -1667,7 +1667,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t
*p_subtitle, int i_idx )
demux_sys_t *p_sys = p_demux->p_sys;
text_t *txt = &p_sys->txt;
-char *psz_text, *psz_orig = NULL;
+char *psz_text, *psz_orig;
char *psz_text2, *psz_orig2;
int h1, h2, m1, m2, s1, s2, f1, f2;
@@ -1683,7 +1683,6 @@ static int ParseJSS( demux_t *p_demux, subtitle_t
*p_subtitle, int i_idx )
/* Parse the main lines */
for( ;; )
{
-free(psz_orig);
const char *s = TextGetLine( txt );
if( !s )
return VLC_EGENERIC;
@@ -1774,10 +1773,16 @@ static int ParseJSS( demux_t *p_demux, subtitle_t
*p_subtitle, int i_idx )
sscanf( &psz_text[shift], "%d", &p_sys->jss.i_time_resolution
);
break;
}
+free( psz_orig );
+continue;
+}
+else
+/* Unkown type line, probably a comment */
+{
+free( psz_orig );
+continue;
}
}
-free( psz_orig );
-psz_orig = NULL;
while( psz_text[ strlen( psz_text ) - 1 ] == '\\' )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "subtitle: Fix potential memory leaks"
vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen | Wed May
24 12:36:19 2017 +0200| [dbe888f9ca9c3b102478b4a16a3d1d985c267899] | committer:
Hugo Beauzée-Luyssen
Revert "subtitle: Fix potential memory leaks"
This reverts commit 85f38701259e07a843a7ee1dd51959151a7bb050.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=dbe888f9ca9c3b102478b4a16a3d1d985c267899
---
modules/demux/subtitle.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index c4402edfb9..3e40f28065 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -1667,7 +1667,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t
*p_subtitle, int i_idx )
demux_sys_t *p_sys = p_demux->p_sys;
text_t *txt = &p_sys->txt;
-char *psz_text, *psz_orig = NULL;
+char *psz_text, *psz_orig;
char *psz_text2, *psz_orig2;
int h1, h2, m1, m2, s1, s2, f1, f2;
@@ -1683,7 +1683,6 @@ static int ParseJSS( demux_t *p_demux, subtitle_t
*p_subtitle, int i_idx )
/* Parse the main lines */
for( ;; )
{
-free(psz_orig);
const char *s = TextGetLine( txt );
if( !s )
return VLC_EGENERIC;
@@ -1774,10 +1773,16 @@ static int ParseJSS( demux_t *p_demux, subtitle_t
*p_subtitle, int i_idx )
sscanf( &psz_text[shift], "%d", &p_sys->jss.i_time_resolution
);
break;
}
+free( psz_orig );
+continue;
+}
+else
+/* Unkown type line, probably a comment */
+{
+free( psz_orig );
+continue;
}
}
-free( psz_orig );
-psz_orig = NULL;
while( psz_text[ strlen( psz_text ) - 1 ] == '\\' )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "subtitle: Fix potential memory leaks"
vlc | branch: master | Hugo Beauzée-Luyssen | Wed May 24
12:35:34 2017 +0200| [3fe69299a738d29abd01d4dd4c6256a70e6cff85] | committer:
Hugo Beauzée-Luyssen
Revert "subtitle: Fix potential memory leaks"
This reverts commit c2e45c4ecf2d51820dfe095d89e8b9379c8df4ca.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3fe69299a738d29abd01d4dd4c6256a70e6cff85
---
modules/demux/subtitle.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 9b417ce454..9726bc26bb 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -1689,7 +1689,7 @@ static int ParseJSS( vlc_object_t *p_obj,
subs_properties_t *p_props,
text_t *txt, subtitle_t *p_subtitle, size_t i_idx )
{
VLC_UNUSED( i_idx );
-char *psz_text, *psz_orig = NULL;
+char *psz_text, *psz_orig;
char *psz_text2, *psz_orig2;
int h1, h2, m1, m2, s1, s2, f1, f2;
@@ -1705,7 +1705,6 @@ static int ParseJSS( vlc_object_t *p_obj,
subs_properties_t *p_props,
/* Parse the main lines */
for( ;; )
{
-free( psz_orig );
const char *s = TextGetLine( txt );
if( !s )
return VLC_EGENERIC;
@@ -1796,10 +1795,16 @@ static int ParseJSS( vlc_object_t *p_obj,
subs_properties_t *p_props,
sscanf( &psz_text[shift], "%d",
&p_props->jss.i_time_resolution );
break;
}
+free( psz_orig );
+continue;
+}
+else
+/* Unkown type line, probably a comment */
+{
+free( psz_orig );
+continue;
}
}
-free( psz_orig );
-psz_orig = NULL;
while( psz_text[ strlen( psz_text ) - 1 ] == '\\' )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] On the road to 2.2.7
vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen | Wed May 24 11:30:49 2017 +0200| [c5a99e76a8fa4fa6c248eef152172416a75a6071] | committer: Hugo Beauzée-Luyssen On the road to 2.2.7 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c5a99e76a8fa4fa6c248eef152172416a75a6071 --- NEWS | 3 +++ configure.ac | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 883218244c..e6997d641c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Changes between 2.2.6 and 2.2.7: + + Changes between 2.2.5.1 and 2.2.6: -- diff --git a/configure.ac b/configure.ac index 235edf577b..6ee411a835 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,10 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2017 VLC authors and VideoLAN]) -AC_INIT(vlc, 2.2.6) +AC_INIT(vlc, 2.2.7) VERSION_MAJOR=2 VERSION_MINOR=2 -VERSION_REVISION=6 +VERSION_REVISION=7 VERSION_EXTRA=0 VERSION_DEV= ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Tag 2.2.6 : VLC media player 2.2.6 "Umbrella"
[vlc/vlc-2.2] [branch: refs/tags/2.2.6] Tag:bb65b52be51faabec3378cb62b36c677ee3f2480 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git?a=tag;h=bb65b52be51faabec3378cb62b36c677ee3f2480 Tagger: Hugo Beauzée-Luyssen Date: Wed May 24 11:27:21 2017 +0200 VLC media player 2.2.6 "Umbrella" This release fixes 2 subtitle security issues (when parsing JSS subtitles) and improves the direct3d video output, mostly for nvidia cards, but not only. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen | Wed May 24 11:27:06 2017 +0200| [1aae78981c0222cbde4c6858fcb643295d96712c] | committer: Hugo Beauzée-Luyssen Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1aae78981c0222cbde4c6858fcb643295d96712c --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 61bd1a100f..883218244c 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ Changes between 2.2.5.1 and 2.2.6: Video output: * Fix systematic green line on nvidia + * Fix direct3d SPU texture offsets handling Demuxer: * Fix heap buffer overflows ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
