[vlc-commits] screen/win32: set sample A/R

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sun May 
17 20:47:39 2015 +0300| [10dac28ad71510549bae0c131a1206ea0a0d2950] | committer: 
Jean-Baptiste Kempf

screen/win32: set sample A/R

(cherry picked from commit a90029df633f04c94b5b50242dcf28cde20470ff)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=10dac28ad71510549bae0c131a1206ea0a0d2950
---

 modules/access/screen/win32.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/access/screen/win32.c b/modules/access/screen/win32.c
index 4a6077c..1139c39 100644
--- a/modules/access/screen/win32.c
+++ b/modules/access/screen/win32.c
@@ -99,6 +99,7 @@ int screen_InitCapture( demux_t *p_demux )
 p_sys->fmt.video.i_visible_height =
 p_sys->fmt.video.i_height = GetDeviceCaps( p_data->hdc_src, 
VERTRES );
 p_sys->fmt.video.i_bits_per_pixel = i_bits_per_pixel;
+p_sys->fmt.video.i_sar_num = p_sys->fmt.video.i_sar_den = 1;
 p_sys->fmt.video.i_chroma = i_chroma;
 p_sys->fmt.video.i_sar_num = p_sys->fmt.video.i_sar_den = 1;
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] mkv: remove incorrect use of N_()

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sat May 
16 23:27:02 2015 +0300| [f3686e65a98a496f638e3822717b48c1d1800706] | committer: 
Jean-Baptiste Kempf

mkv: remove incorrect use of N_()

(cherry picked from commit 3d94da0dbd0c468c493ae8d9c8f0b993d65da3b0)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f3686e65a98a496f638e3822717b48c1d1800706
---

 modules/demux/mkv/chapter_command.cpp |   10 +-
 modules/demux/mkv/demux.cpp   |2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/mkv/chapter_command.cpp 
b/modules/demux/mkv/chapter_command.cpp
index ec7e7ac..0c8be43 100644
--- a/modules/demux/mkv/chapter_command.cpp
+++ b/modules/demux/mkv/chapter_command.cpp
@@ -133,28 +133,28 @@ std::string dvd_chapter_codec_c::GetCodecName( bool 
f_for_title ) const
 uint16_t i_title = (p_data[1] << 8) + p_data[2];
 char psz_str[11];
 sprintf( psz_str, " %d  ---", i_title );
-result = N_("---  DVD Title");
+result = "---  DVD Title";
 result += psz_str;
 }
 else */ if ( p_data[0] == MATROSKA_DVD_LEVEL_LU )
 {
 char psz_str[11];
 sprintf( psz_str, " (%c%c)  ---", p_data[1], p_data[2] );
-result = N_("---  DVD Menu");
+result = "---  DVD Menu";
 result += psz_str;
 }
 else if ( p_data[0] == MATROSKA_DVD_LEVEL_SS && f_for_title )
 {
 if ( p_data[1] == 0x00 )
-result = N_("First Played");
+result = "First Played";
 else if ( p_data[1] == 0xC0 )
-result = N_("Video Manager");
+result = "Video Manager";
 else if ( p_data[1] == 0x80 )
 {
 uint16_t i_title = (p_data[2] << 8) + p_data[3];
 char psz_str[20];
 sprintf( psz_str, " %d -", i_title );
-result = N_("- Title");
+result = "- Title";
 result += psz_str;
 }
 }
diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index c78c93b..faabcaf 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -712,7 +712,7 @@ bool demux_sys_t::PreloadLinked()
 }
 
 if( !p_title->psz_name &&
-asprintf(&(p_title->psz_name), "%s %d", 
N_("Segment"), (int)ij) == -1 )
+asprintf(&(p_title->psz_name), "%s %d", "Segment", 
(int)ij) == -1 )
 p_title->psz_name = NULL;
 }
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] wmadec: drop M_PI define

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews  | Wed May 
13 13:45:11 2015 -0400| [c590de7c4d409772a0cd9a839d567060aa3d660f] | committer: 
Jean-Baptiste Kempf

wmadec: drop M_PI define

(cherry picked from commit cdcd6c1108ef776ecc5880217ca739ed5d3a95dc)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c590de7c4d409772a0cd9a839d567060aa3d660f
---

 modules/codec/wmafixed/wmadec.h |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/codec/wmafixed/wmadec.h b/modules/codec/wmafixed/wmadec.h
index ee7f35d..3e3a320 100644
--- a/modules/codec/wmafixed/wmadec.h
+++ b/modules/codec/wmafixed/wmadec.h
@@ -21,6 +21,7 @@
 #define _WMADEC_H
 
 #include 
+#include 
 
 #include "asf.h"
 #include "bitstream.h" /* For GetBitContext */
@@ -43,8 +44,6 @@
 /* XXX: is it a suitable value ? */
 #define MAX_CODED_SUPERFRAME_SIZE 16384
 
-#define M_PI3.14159265358979323846
-
 #define M_PI_F  0x3243f // in fixed 32 format
 #define TWO_M_PI_F  0x6487f   //in fixed 32
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sap: call recv() directly

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sun May 
10 19:58:18 2015 +0300| [2e8cba3db74f8dbd3fb76f175ac83dba8ba93780] | committer: 
Jean-Baptiste Kempf

sap: call recv() directly

net_Read() is identical to recv() outside the input thread and if
waitall is false.

(cherry picked from commit f9c35694825e05d1f1da6f44d40d2554cb593aa4)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2e8cba3db74f8dbd3fb76f175ac83dba8ba93780
---

 modules/services_discovery/sap.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index a044d4e..bc658f9 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -553,8 +553,7 @@ static void *Run( void *data )
 uint8_t p_buffer[MAX_SAP_BUFFER+1];
 ssize_t i_read;
 
-i_read = net_Read (p_sd, ufd[i].fd, NULL, p_buffer,
-   MAX_SAP_BUFFER, false);
+i_read = recv (ufd[i].fd, p_buffer, MAX_SAP_BUFFER, 0);
 if (i_read < 0)
 msg_Warn (p_sd, "receive error: %s",
   vlc_strerror_c(errno));

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Add wMP4 fourCC for Mp4v

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Tue 
May 19 23:28:26 2015 +0200| [2a3d52d41c2394227bc0ee121c8119db009ef829] | 
committer: Jean-Baptiste Kempf

Add wMP4 fourCC for Mp4v

(cherry picked from commit 71a05464a46c70c6bd64b2119a193c65ca201689)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2a3d52d41c2394227bc0ee121c8119db009ef829
---

 src/misc/fourcc.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 29d8271..35f933a 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -203,6 +203,7 @@ static const staticentry_t p_list_video[] = {
 E("PLV1", "Pelco DVR MPEG-4"),
 E("QMP4", "QNAP Systems MPEG-4"),
 E("qMP4", "QNAP Systems MPEG-4"),
+A("wMP4"), /* Seems QNAP too */
 /* 3ivx delta 3.5 Unsupported
  * putting it here gives extreme distorted images */
 //E("3IV1", "3ivx delta 3.5 MPEG-4 Video"),

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sharpen: help compiler auto-vectorization

[Felix Abecassis]

vlc/vlc-2.2 | branch: master | Felix Abecassis  | 
Fri May 22 15:32:39 2015 -0400| [d86a7e5df06cb6fed3c8826a6c61cdb03c95df43] | 
committer: Jean-Baptiste Kempf

sharpen: help compiler auto-vectorization

Refs #9458

Signed-off-by: Tristan Matthews 
(cherry picked from commit 32466e668505f25097e2811a563a19d16de5fbb7)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=d86a7e5df06cb6fed3c8826a6c61cdb03c95df43
---

 modules/video_filter/sharpen.c |   38 --
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 8714673..5311464 100644
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -171,13 +171,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t 
*p_pic )
 {
 picture_t *p_outpic;
 int i, j;
-uint8_t *p_src = NULL;
-uint8_t *p_out = NULL;
+uint8_t *restrict p_src = NULL;
+uint8_t *restrict p_out = NULL;
 int i_src_pitch;
 int i_out_pitch;
 int pix;
 const int v1 = -1;
 const int v2 = 3; /* 2^3 = 8 */
+const unsigned i_visible_lines = p_pic->p[Y_PLANE].i_visible_lines;
+const unsigned i_visible_pitch = p_pic->p[Y_PLANE].i_visible_pitch;
+const int sigma = var_GetFloat( p_filter, FILTER_PREFIX "sigma" ) * (1 << 
20);
 
 if( !p_pic ) return NULL;
 
@@ -196,22 +199,15 @@ static picture_t *Filter( filter_t *p_filter, picture_t 
*p_pic )
 
 /* perform convolution only on Y plane. Avoid border line. */
 vlc_mutex_lock( _filter->p_sys->lock );
-for( i = 0; i < p_pic->p[Y_PLANE].i_visible_lines; i++ )
+
+memcpy(p_out, p_src, i_visible_pitch);
+
+for( i = 1; i < i_visible_lines - 1; i++ )
 {
-if( (i == 0) || (i == p_pic->p[Y_PLANE].i_visible_lines - 1) )
-{
-for( j = 0; j < p_pic->p[Y_PLANE].i_visible_pitch; j++ )
-p_out[i * i_out_pitch + j] = clip( p_src[i * i_src_pitch + j] 
);
-continue ;
-}
-for( j = 0; j < p_pic->p[Y_PLANE].i_visible_pitch; j++ )
-{
-if( (j == 0) || (j == p_pic->p[Y_PLANE].i_visible_pitch - 1) )
-{
-p_out[i * i_out_pitch + j] = p_src[i * i_src_pitch + j];
-continue ;
-}
+p_out[i * i_out_pitch] = p_src[i * i_src_pitch];
 
+for( j = 1; j < i_visible_pitch - 1; j++ )
+{
 pix = (p_src[(i - 1) * i_src_pitch + j - 1] * v1) +
   (p_src[(i - 1) * i_src_pitch + j] * v1) +
   (p_src[(i - 1) * i_src_pitch + j + 1] * v1) +
@@ -223,10 +219,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t 
*p_pic )
   (p_src[(i + 1) * i_src_pitch + j + 1] * v1);
 
pix = pix >= 0 ? clip(pix) : -clip(pix * -1);
-   p_out[i * i_out_pitch + j] = clip( p_src[i * i_src_pitch + j] +
-   p_filter->p_sys->tab_precalc[pix + 256] );
+   p_out[i * i_out_pitch + j] = clip( p_src[i * i_src_pitch + j]
+  + ((pix * sigma) >> 20));
 }
+
+p_out[i * i_out_pitch + i_visible_pitch - 1] =
+p_src[i * i_src_pitch + i_visible_pitch - 1];
 }
+memcpy(_out[(i_visible_lines - 1) * i_out_pitch],
+   _src[(i_visible_lines - 1) * i_src_pitch], i_visible_pitch);
+
 vlc_mutex_unlock( _filter->p_sys->lock );
 
 plane_CopyPixels( _outpic->p[U_PLANE], _pic->p[U_PLANE] );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Add wIVG as MJPEG fourcc

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Tue 
May 19 23:25:03 2015 +0200| [071c083475a5e9119654f937e09548093d10f22d] | 
committer: Jean-Baptiste Kempf

Add wIVG as MJPEG fourcc

(cherry picked from commit ebee486e9bd8beb70108dd4982c937dbbdcd5e8c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=071c083475a5e9119654f937e09548093d10f22d
---

 src/misc/fourcc.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index bed372d..29d8271 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -375,8 +375,9 @@ static const staticentry_t p_list_video[] = {
 A("FLJP"),
 A("FMJP"),
 A("SJPG"),
-A("QIVG"),
-A("qIVG"),
+A("QIVG"), /* Probably QNAP */
+A("qIVG"), /* Probably QNAP */
+A("wIVG"), /* Probably QNAP */
 E("AVRn", "Avid Motion JPEG"),
 E("AVDJ", "Avid Motion JPEG"),
 E("ADJV", "Avid Motion JPEG"),

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Mediacodec: timeouts are in µs

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf  | Wed Oct 21 
16:06:55 2015 +0200| [509f755a9e4f20e56c446cc29a43941e5d1db318] | committer: 
Jean-Baptiste Kempf

Mediacodec: timeouts are in µs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=509f755a9e4f20e56c446cc29a43941e5d1db318
---

 modules/codec/omxil/mediacodec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index a09853f..b1fe5db 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -1193,7 +1193,7 @@ static int DecodeCommon(decoder_t *p_dec, block_t 
**pp_block,
  * indefinitely and abort after 2seconds (100 * 2 * 10ms)
  * without any data.  Indeed, MediaCodec can fail without
  * throwing any exception or error returns... */
-msg_Err(p_dec, "No output/input for %lld ms, abort",
+msg_Err(p_dec, "No output/input for %lld us, abort",
 i_attempts * timeout);
 b_error = true;
 break;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] lua readme: mention state as second parameter for add_check_box

[David Fuhrmann]

vlc/vlc-2.2 | branch: master | David Fuhrmann  | Thu 
Jun 11 19:25:39 2015 +0200| [601c5502d2db7a6162f5c805412e0ded3c1311b6] | 
committer: Jean-Baptiste Kempf

lua readme: mention state as second parameter for add_check_box

(cherry picked from commit 377bab66f9721a22a9c1bb82acd84cd71db45b14)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=601c5502d2db7a6162f5c805412e0ded3c1311b6
---

 share/lua/README.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/lua/README.txt b/share/lua/README.txt
index 84f322f..a3fea24 100644
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -71,7 +71,7 @@ d:add_label( text, ... ): Create a text label with caption 
"text" (string).
 d:add_html( text, ... ): Create a rich text label with caption "text" 
(string), that supports basic HTML formatting (such as  or  for 
instance).
 d:add_text_input( text, ... ): Create an editable text field, in order to read 
user input.
 d:add_password( text, ... ): Create an editable text field, in order to read 
user input. Text entered in this box will not be readable (replaced by 
asterisks).
-d:add_check_box( text, ... ): Create a check box with a text. They have a 
boolean state (true/false).
+d:add_check_box( text, state, ... ): Create a check box with a text. They have 
a boolean state (true/false).
 d:add_dropdown( ... ): Create a drop-down widget. Only 1 element can be 
selected the same time.
 d:add_list( ... ): Create a list widget. Allows multiple or empty selections.
 d:add_image( path, ... ): Create an image label. path is a relative or 
absolute path to the image on the local computer.

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: fix future HTTP access issues

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne  | Mon 
Jul 20 12:38:05 2015 +0200| [9e88442ce4b0486436583815a884e70bb4fa3e99] | 
committer: Jean-Baptiste Kempf

macosx: fix future HTTP access issues

(cherry picked from commit aff23ff542b6cb330777b793f808408b0474a53e)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9e88442ce4b0486436583815a884e70bb4fa3e99
---

 extras/package/macosx/Info.plist.in |5 +
 1 file changed, 5 insertions(+)

diff --git a/extras/package/macosx/Info.plist.in 
b/extras/package/macosx/Info.plist.in
index 340c24d..520bc15 100644
--- a/extras/package/macosx/Info.plist.in
+++ b/extras/package/macosx/Info.plist.in
@@ -1346,6 +1346,11 @@
http://update.videolan.org/vlc/sparkle/vlc-intel64.xml
SUPublicDSAKeyFile
dsa_pub.pem
+   NSAppTransportSecurity
+   
+   NSAllowsArbitraryLoads
+   
+   
CFBundleExecutable
VLC
CFBundleGetInfoString

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Dshow: fix freeze

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Wed 
Jul 15 08:51:05 2015 +0200| [0f13e8d16b5b7be99776b72ede9b189596b72af8] | 
committer: Jean-Baptiste Kempf

Dshow: fix freeze

Close #14278

(cherry picked from commit a81cc9be43b5f2a6b3ecdb3b2850f28fd22a9a5e)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0f13e8d16b5b7be99776b72ede9b189596b72af8
---

 modules/access/dshow/dshow.cpp |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 0e21fe4..684e2c2 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -1885,7 +1885,7 @@ static int Demux( demux_t *p_demux )
 
 REFERENCE_TIME i_pts, i_end_date;
 HRESULT hr = sample.p_sample->GetTime( _pts, _end_date );
-if( hr == S_OK || hr == VFW_S_NO_STOP_TIME )
+if( hr != S_OK && hr != VFW_S_NO_STOP_TIME )
 {
 if( p_stream->mt.majortype == MEDIATYPE_Video || 
!p_stream->b_pts )
 {
@@ -1893,12 +1893,15 @@ static int Demux( demux_t *p_demux )
 i_pts = sample.i_timestamp;
 p_stream->b_pts = true;
 }
+else
+i_pts = VLC_TS_INVALID;
+}
+
+if( i_pts > VLC_TS_INVALID ) {
 i_pts += (i_pts >= 0) ? +5 : -4;
 i_pts /= 10; /* 100-ns to µs conversion */
 i_pts += VLC_TS_0;
 }
-else
-i_pts = VLC_TS_INVALID;
 #if 0
 msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: %"PRId64,
  i_stream, i_data_size, i_pts );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Tue Jul  7 
19:22:00 2015 +0200| [81987901b362617968bff4423b9034cb55448877] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leak

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit c5a36efc2bbcae2adc9016eda9a4530527de2e56)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=81987901b362617968bff4423b9034cb55448877
---

 modules/gui/qt4/dialogs/toolbar.cpp |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/qt4/dialogs/toolbar.cpp 
b/modules/gui/qt4/dialogs/toolbar.cpp
index c1e667a..4a8d48a 100644
--- a/modules/gui/qt4/dialogs/toolbar.cpp
+++ b/modules/gui/qt4/dialogs/toolbar.cpp
@@ -888,6 +888,8 @@ bool DroppingController::eventFilter( QObject *obj, QEvent 
*event )
 /* Start the effective drag */
 drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::MoveAction);
 b_draging = false;
+
+delete dI;
 }
 return true;
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] DirectSound: meaningfull error messages

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Fri 
Jul 17 16:56:02 2015 +0200| [08fa6fa20c89bf9f45a718f21be8d6acf6bfefbc] | 
committer: Jean-Baptiste Kempf

DirectSound: meaningfull error messages

(cherry picked from commit e710a62cdf09fe2f08da2bd9dbdd291e4ad1140b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=08fa6fa20c89bf9f45a718f21be8d6acf6bfefbc
---

 modules/audio_output/directsound.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/audio_output/directsound.c 
b/modules/audio_output/directsound.c
index 88326d0..f2f6964 100644
--- a/modules/audio_output/directsound.c
+++ b/modules/audio_output/directsound.c
@@ -286,7 +286,7 @@ static HRESULT Play( vlc_object_t *obj, aout_stream_sys_t 
*sys,
 0, 0, DSBPLAY_LOOPING );
 }
 if( dsresult != DS_OK )
-msg_Err( obj, "cannot start playing buffer" );
+msg_Err( obj, "cannot start playing buffer: (hr=0x%0lx)", dsresult );
 else
 {
 vlc_mutex_lock( >lock );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] codec: cc: add missing module category

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Tue Aug 
11 02:21:15 2015 +0200| [8aaa7db079876c6560b7f3ba07da7261b3afdeef] | committer: 
Jean-Baptiste Kempf

codec: cc: add missing module category

(cherry picked from commit 4dec56b69c1ca462051430987063c94bd44bb97b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8aaa7db079876c6560b7f3ba07da7261b3afdeef
---

 modules/codec/cc.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index b0bff90..9da2fc5 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -55,6 +55,8 @@ vlc_module_begin ()
 set_shortname( N_("CC 608/708"))
 set_description( N_("Closed Captions decoder") )
 set_capability( "decoder", 50 )
+set_category( CAT_INPUT )
+set_subcategory( SUBCAT_INPUT_SCODEC )
 set_callbacks( Open, Close )
 vlc_module_end ()
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avcodec: refactor frame_rate probing into own function

[Ilkka Ollakka]

vlc/vlc-2.2 | branch: master | Ilkka Ollakka  | Sun Aug  9 
00:36:52 2015 +0300| [f0d7d184abb022ff2ce3401bad224946fb466cdc] | committer: 
Jean-Baptiste Kempf

avcodec: refactor frame_rate probing into own function

if codec has list of supported framerates, select highest one
unless user has provided one. If we end up using CLOCK_FREQ in
time_base, it should be quite ok in most cases. Tested with ts/mp4/webm
and mp2v/mp4v/VP80. For some cases it can select higher fps in
mpeg-codecs (60fps) in case of input fps isn't yet known in that point
or is fubared.

Also add special case for MP4V as it doesn't like CLOCK_FREQ in
time_base/frame_rates.

(cherry picked from commit 3068a8495639f4bada2f0f9bb9ed9e7daf73d540)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f0d7d184abb022ff2ce3401bad224946fb466cdc
---

 modules/codec/avcodec/encoder.c |   55 +++
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index ab95191..457078a 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -246,6 +246,44 @@ static const int DEFAULT_ALIGN = 1;
 /*
  * OpenEncoder: probe the encoder
  */
+static void probe_video_frame_rate( encoder_t *p_enc, AVCodecContext 
*p_context, AVCodec *p_codec )
+{
+/* if we don't have i_frame_rate_base, we are probing and just checking if 
we can find codec
+ * so set fps to requested fps if asked by user or input fps is availabled 
*/
+p_context->time_base.num = p_enc->fmt_in.video.i_frame_rate_base ? 
p_enc->fmt_in.video.i_frame_rate_base : 1;
+
+// MP4V doesn't like CLOCK_FREQ denominator in time_base, so use 1/25 as 
default for that
+p_context->time_base.den = p_enc->fmt_in.video.i_frame_rate_base ? 
p_enc->fmt_in.video.i_frame_rate :
+  ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4V ? 
25 : CLOCK_FREQ );
+
+msg_Dbg( p_enc, "Time base for probing setted to %d/%d", 
p_context->time_base.num, p_context->time_base.den );
+if( p_codec->supported_framerates )
+{
+/* We are finding fps values so 1/time_base */
+AVRational target = {
+.num = p_context->time_base.den,
+.den = p_context->time_base.num
+};
+int idx = av_find_nearest_q_idx(target, p_codec->supported_framerates);
+
+p_context->time_base.num = p_codec->supported_framerates[idx].den ?
+p_codec->supported_framerates[idx].den : 1;
+p_context->time_base.den = p_codec->supported_framerates[idx].den ?
+p_codec->supported_framerates[idx].num : 
CLOCK_FREQ;
+
+/* If we have something reasonable on supported framerates, use that*/
+if( p_context->time_base.den && p_context->time_base.den < CLOCK_FREQ )
+{
+p_enc->fmt_out.video.i_frame_rate_base =
+p_enc->fmt_in.video.i_frame_rate_base =
+p_context->time_base.num;
+p_enc->fmt_out.video.i_frame_rate =
+p_enc->fmt_in.video.i_frame_rate =
+p_context->time_base.den;
+}
+}
+msg_Dbg( p_enc, "Time base set to %d/%d", p_context->time_base.num, 
p_context->time_base.den );
+}
 
 int OpenEncoder( vlc_object_t *p_this )
 {
@@ -471,22 +509,7 @@ int OpenEncoder( vlc_object_t *p_this )
 p_context->width = p_enc->fmt_in.video.i_visible_width;
 p_context->height = p_enc->fmt_in.video.i_visible_height;
 
-/* if we don't have i_frame_rate_base, we are probing and just 
checking if we can find codec
- * so set fps to 25 as some codecs (DIV3 atleast) needs time_base data 
*/
-p_context->time_base.num = p_enc->fmt_in.video.i_frame_rate_base ? 
p_enc->fmt_in.video.i_frame_rate_base : 1;
-p_context->time_base.den = p_enc->fmt_in.video.i_frame_rate_base ? 
p_enc->fmt_in.video.i_frame_rate : 25 ;
-if( p_codec->supported_framerates )
-{
-AVRational target = {
-.num = p_enc->fmt_in.video.i_frame_rate,
-.den = p_enc->fmt_in.video.i_frame_rate_base,
-};
-int idx = av_find_nearest_q_idx(target, 
p_codec->supported_framerates);
-
-p_context->time_base.num = p_codec->supported_framerates[idx].den;
-p_context->time_base.den = p_codec->supported_framerates[idx].num;
-}
-msg_Dbg( p_enc, "Time base set to %d/%d", p_context->time_base.num, 
p_context->time_base.den );
+probe_video_frame_rate( p_enc, p_context, p_codec );
 
 /* Defaults from ffmpeg.c */
 p_context->qblur = 0.5;

___

[vlc-commits] alsa: fix potentially uninitialized value

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Aug 
21 19:46:09 2015 +0300| [1f3c422a7f71e23bafc28c61ddade9ce1f52e197] | committer: 
Jean-Baptiste Kempf

alsa: fix potentially uninitialized value

(cherry picked from commit 81a081661a25bddbc74161a4fbcc87cf2eef)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1f3c422a7f71e23bafc28c61ddade9ce1f52e197
---

 modules/audio_output/alsa.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 229d1881..7e71d3e 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -330,7 +330,7 @@ static int Start (audio_output_t *aout, 
audio_sample_format_t *restrict fmt)
 char sep = '\0';
 if (spdif)
 {
-const char *opt;
+const char *opt = NULL;
 
 if (!strcmp (device, "default"))
 device = "iec958"; /* TODO: hdmi */

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] caf: fix error handling / integer overflow

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Aug 
21 20:01:47 2015 +0300| [c6d45ea9e570f20c3aa16d72cf2423b463063124] | committer: 
Jean-Baptiste Kempf

caf: fix error handling / integer overflow

(cherry picked from commit de1b8bc4993780e2b92ee4b1e4ff27c9f3831dc6)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c6d45ea9e570f20c3aa16d72cf2423b463063124
---

 modules/demux/caf.c |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/demux/caf.c b/modules/demux/caf.c
index 465caf6..f5c63fc 100644
--- a/modules/demux/caf.c
+++ b/modules/demux/caf.c
@@ -277,7 +277,11 @@ static int FrameSpanAddDescription( demux_t *p_demux, 
uint64_t i_desc_offset, fr
 }
 
 const uint8_t *p_peek;
-uint32_t i_peek_len = stream_Peek( p_demux->s, _peek, 2 * 10 ); /* 
Peeking the maximum number of bytes that two 64 bit numbers could use (( 64 + 6 
) / 7 = 10 ). */
+int i_peek_len = stream_Peek( p_demux->s, _peek, 2 * 10 );
+/* Peeking the maximum number of bytes that two 64 bit numbers could use
+ * (( 64 + 6 ) / 7 = 10). */
+if( i_peek_len < 0 )
+i_peek_len = 0;
 
 if( p_sys->fmt.audio.i_bytes_per_frame )
 {
@@ -302,7 +306,7 @@ static int FrameSpanAddDescription( demux_t *p_demux, 
uint64_t i_desc_offset, fr
 }
 else
 {
-if( i_desc_size >= i_peek_len )
+if( i_desc_size >= (unsigned)i_peek_len )
 {
 return VLC_EGENERIC;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: mp4: reset stream position on late open failure

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Mon Jun  
8 12:53:26 2015 +0200| [f71237661a2f273c231f88ef2983fc0b40ad8985] | committer: 
Jean-Baptiste Kempf

demux: mp4: reset stream position on late open failure

(cherry picked from commit a86345842d0aa2c942c5001ef5125b724a313f39)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f71237661a2f273c231f88ef2983fc0b40ad8985
---

 modules/demux/mp4/mp4.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 46c5f9a..58353eb 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -763,6 +763,9 @@ static int Open( vlc_object_t * p_this )
 return VLC_SUCCESS;
 
 error:
+if( stream_Tell( p_demux->s ) > 0 )
+stream_Seek( p_demux->s, 0 );
+
 if( p_sys->p_root )
 {
 MP4_BoxFree( p_demux->s, p_sys->p_root );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] es_out: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Tue Jul  7 
19:22:01 2015 +0200| [c4ccf040b83ac83bf453ed7c5a26efdca2171a69] | committer: 
Jean-Baptiste Kempf

es_out: fix memory leak

Signed-off-by: Rémi Denis-Courmont 
(cherry picked from commit 3906a0a29f74cd2bc75cbfa7683d6e2b01b6e806)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c4ccf040b83ac83bf453ed7c5a26efdca2171a69
---

 src/input/es_out.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index ddf01e1..324726d 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1339,6 +1339,7 @@ static void EsOutProgramUpdateScrambled( es_out_t *p_out, 
es_out_pgrm_t *p_pgrm
 input_Control( p_input, INPUT_ADD_INFO, psz_cat, _("Scrambled"), 
_("Yes") );
 else
 input_Control( p_input, INPUT_DEL_INFO, psz_cat, _("Scrambled") );
+free( psz_cat );
 
 input_SendEventProgramScrambled( p_input, p_pgrm->i_id, b_scrambled );
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
14:34:41 2015 +0200| [8a7acb1e7424a0be03e01cde7ceaab6dc486c7c6] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leak

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 98f1ae98a639f465b756fa881f873e9892e38964)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8a7acb1e7424a0be03e01cde7ceaab6dc486c7c6
---

 modules/gui/qt4/dialogs/open.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 56ea980..500e1e4 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -111,7 +111,7 @@ OpenDialog::OpenDialog( QWidget *parent,
 selectButton = new QPushButton( qtr( "" ) );
 
 /* Menu for the Play button */
-QMenu * openButtonMenu = new QMenu( "Open" );
+QMenu * openButtonMenu = new QMenu( "Open", playButton );
 openButtonMenu->addAction( qtr( "" ), this, SLOT( enqueue() ),
 QKeySequence( "Alt+E" ) );
 openButtonMenu->addAction( qtr( "" ), this, SLOT( play() ),

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leaks

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
21:42:08 2015 +0200| [f453e0db3efbe0724dfb8ccadd19fb67405fc2f2] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leaks

QTreeWidgetItem::setData() doesn't take ownership

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 66c53a282536e79c5e3310279fb2cad88a54b7e5)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f453e0db3efbe0724dfb8ccadd19fb67405fc2f2
---

 modules/gui/qt4/components/complete_preferences.cpp |8 
 modules/gui/qt4/components/complete_preferences.hpp |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/complete_preferences.cpp 
b/modules/gui/qt4/components/complete_preferences.cpp
index c4e98f7..f850aaf 100644
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -101,7 +101,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget 
*_parent ) :
 if( p_item->value.i == -1 ) break;
 
 /* PrefsItemData Init */
-data = new PrefsItemData();
+data = new PrefsItemData( this );
 data->name = qtr( config_CategoryNameGet( p_item->value.i ) );
 psz_help = config_CategoryHelpGet( p_item->value.i );
 if( psz_help )
@@ -167,7 +167,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget 
*_parent ) :
 /* Normal Subcategories */
 
 /* Process the Data */
-data_sub = new PrefsItemData();
+data_sub = new PrefsItemData( this );
 data_sub->name = qtr( config_CategoryNameGet( p_item->value.i) );
 psz_help = config_CategoryHelpGet( p_item->value.i );
 if( psz_help )
@@ -268,7 +268,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget 
*_parent ) :
 }
 if( !b_found ) continue;
 
-PrefsItemData *module_data = new PrefsItemData();
+PrefsItemData *module_data = new PrefsItemData( this );
 module_data->i_type = PrefsItemData::TYPE_MODULE;
 module_data->psz_shortcut = strdup( module_get_object( p_module ) );
 module_data->name = qtr( module_get_name( p_module, false ) );
@@ -478,7 +478,7 @@ void PrefsTree::resizeColumns()
 resizeColumnToContents( 0 );
 }
 
-PrefsItemData::PrefsItemData()
+PrefsItemData::PrefsItemData( QObject *_parent ) : QObject( _parent )
 {
 panel = NULL;
 i_object_id = 0;
diff --git a/modules/gui/qt4/components/complete_preferences.hpp 
b/modules/gui/qt4/components/complete_preferences.hpp
index 3b32c3a..7be5688 100644
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -42,7 +42,7 @@ class PrefsItemData : public QObject
 {
 Q_OBJECT
 public:
-PrefsItemData();
+PrefsItemData( QObject * );
 virtual ~PrefsItemData() { free( psz_shortcut ); };
 bool contains( const QString , Qt::CaseSensitivity cs );
 AdvPrefsPanel *panel;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] aout: fix aout_CheckChannelExtraction return value

[Thomas Guillem]

vlc/vlc-2.2 | branch: master | Thomas Guillem  | Mon Jul 27 
17:18:24 2015 +0200| [e7c17306a63c646af1a53df4fbfb862ff7a47cd7] | committer: 
Jean-Baptiste Kempf

aout: fix aout_CheckChannelExtraction return value

This function returns true if channel extraction is needed.

If layouts are the same, channel extraction should be needed only if the number
of channels is different.

(cherry picked from commit d71d17755a1f8f196b22144fd1cb2f60ac619141)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e7c17306a63c646af1a53df4fbfb862ff7a47cd7
---

 src/audio_output/common.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index f92230e..09dca5c 100644
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -511,7 +511,7 @@ bool aout_CheckChannelExtraction( int *pi_selection,
 if( pi_selection[i] != i )
 return true;
 }
-return i_out == i_channels;
+return i_out != i_channels;
 }
 
 /* Return the order in which filters should be inserted */

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] input: fix NULL dereference with --demux ""

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sun Jul 
26 18:06:50 2015 +0300| [2cdadbd93ab978327bcb9d4cc2f16faa1272ff1c] | committer: 
Jean-Baptiste Kempf

input: fix NULL dereference with --demux ""

(cherry picked from commit adcff8d401c223d0442c28d3246546e7cdef2630)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2cdadbd93ab978327bcb9d4cc2f16faa1272ff1c
---

 src/input/input.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index 05e4ff3..9832ed1 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2228,7 +2228,7 @@ static int InputSourceInit( input_thread_t *p_input,
 /* special hack for forcing a demuxer with --demux=module
  * (and do nothing with a list) */
 psz_var_demux = var_GetNonEmptyString( p_input, "demux" );
-psz_demux = psz_var_demux;
+psz_demux = (psz_var_demux != NULL) ? psz_var_demux : "any";
 msg_Dbg( p_input, "specified demux `%s'", psz_demux );
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avcodec: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Tue Jul 28 
18:12:27 2015 +0200| [4b2099b13f8018347ca0c054580b76bebab5b20a] | committer: 
Jean-Baptiste Kempf

avcodec: fix memory leak

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 7a06d63a3b8be54d7994d68b4ac7c9c05210a815)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4b2099b13f8018347ca0c054580b76bebab5b20a
---

 modules/codec/avcodec/audio.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 34c8352..ae2f9dd 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -395,6 +395,7 @@ block_t * DecodeAudio ( decoder_t *p_dec, block_t 
**pp_block )
 p_block = vlc_av_frame_Wrap(frame);
 if (unlikely(p_block == NULL))
 goto drop;
+frame = NULL;
 }
 #else
 {
@@ -449,6 +450,7 @@ block_t * DecodeAudio ( decoder_t *p_dec, block_t 
**pp_block )
 end:
 *pp_block = NULL;
 drop:
+av_frame_free();
 if( p_block != NULL )
 block_Release(p_block);
 return NULL;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: fr: fix reversed meaning

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Wed Aug  
5 22:08:22 2015 +0200| [2295506e13f2d4eb8d5dad1393a91d5d6df56834] | committer: 
Jean-Baptiste Kempf

l10n: fr: fix reversed meaning

(cherry picked from commit cb2293a5d978e44d678f8e00c6c38151e136b7cf)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2295506e13f2d4eb8d5dad1393a91d5d6df56834
---

 po/fr.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/fr.po b/po/fr.po
index 699195f..8517160 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24658,7 +24658,7 @@ msgstr "Overlay/Sous-titres"
 
 #: modules/text_renderer/freetype.c:96
 msgid "Monospace Font"
-msgstr "Police proportionnelle"
+msgstr "Police à chasse fixe"
 
 #: modules/text_renderer/freetype.c:98
 msgid "Font family for the font you want to use"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] twolame: remove extra header download

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern  | Mon Jul 27 
12:02:22 2015 -0400| [46d89811bcf0266ca83b7319dd399b903da55e32] | committer: 
Jean-Baptiste Kempf

twolame: remove extra header download

The changes have already been merged into 0.3.13.

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 130da2a0256bc032a7f96d446f72a69d5d33867d)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=46d89811bcf0266ca83b7319dd399b903da55e32
---

 contrib/src/twolame/SHA512SUMS |1 -
 contrib/src/twolame/rules.mak  |   10 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/contrib/src/twolame/SHA512SUMS b/contrib/src/twolame/SHA512SUMS
index 49a5fe9..18b339d 100644
--- a/contrib/src/twolame/SHA512SUMS
+++ b/contrib/src/twolame/SHA512SUMS
@@ -1,2 +1 @@
 
241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
  twolame-0.3.13.tar.gz
-d19263c9c8fddca7bfd306c07d45fb649e29f9c3c978b9dd2c70d122bc335a569228cc0961b1a15162b2ab9e44a1595ea107ac359ea08a8256fe780d8f173e8d
  twolame-winutil.h
diff --git a/contrib/src/twolame/rules.mak b/contrib/src/twolame/rules.mak
index 345bc23..7f3756d 100644
--- a/contrib/src/twolame/rules.mak
+++ b/contrib/src/twolame/rules.mak
@@ -13,16 +13,10 @@ endif
 $(TARBALLS)/twolame-$(TWOLAME_VERSION).tar.gz:
$(call download,$(TWOLAME_URL))
 
-$(TARBALLS)/twolame-winutil.h:
-   $(call 
download,"http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h;)
+.sum-twolame: twolame-$(TWOLAME_VERSION).tar.gz
 
-.sum-twolame: twolame-$(TWOLAME_VERSION).tar.gz twolame-winutil.h
-
-twolame: twolame-$(TWOLAME_VERSION).tar.gz twolame-winutil.h .sum-twolame
+twolame: twolame-$(TWOLAME_VERSION).tar.gz .sum-twolame
$(UNPACK)
-ifdef HAVE_WIN32
-   cp -f $(filter %winutil.h,$^) $@-$(TWOLAME_VERSION)/win32/winutil.h
-endif
$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && cp config.guess config.sub 
build-scripts
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] speex: avoid unsigned->signed->unsigned conversion (CID #1048968)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sun Aug 
23 10:33:50 2015 +0300| [04928e30804592dc68f2ad58082a1e3288be4415] | committer: 
Jean-Baptiste Kempf

speex: avoid unsigned->signed->unsigned conversion (CID #1048968)

(cherry picked from commit cb267c8052444a1f14e903203ad7da9e5b8df1d9)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=04928e30804592dc68f2ad58082a1e3288be4415
---

 modules/codec/speex.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index c93fbc6..e21c7fa 100644
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -1061,7 +1061,7 @@ static block_t *Encode( encoder_t *p_enc, block_t 
*p_aout_buf )
 if( unlikely( !p_aout_buf ) ) return NULL;
 
 unsigned char *p_buffer = p_aout_buf->p_buffer;
-int i_samples = p_aout_buf->i_nb_samples;
+unsigned i_samples = p_aout_buf->i_nb_samples;
 int i_samples_delay = p_sys->i_samples_delay;
 
 mtime_t i_pts = p_aout_buf->i_pts -

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] v4l2: also print visible dimensions in the logs

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Mon Jun 
29 10:13:58 2015 +0300| [a69f0715a2d9fd5322c5348b1fe75a65a9233ef8] | committer: 
Jean-Baptiste Kempf

v4l2: also print visible dimensions in the logs

(cherry picked from commit 4e5b9f75913c0d9c494f0cbe11c7ba39fd8ba2e7)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a69f0715a2d9fd5322c5348b1fe75a65a9233ef8
---

 modules/access/v4l2/demux.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
index db8bfec..6e514dd 100644
--- a/modules/access/v4l2/demux.c
+++ b/modules/access/v4l2/demux.c
@@ -404,7 +404,9 @@ static int InitVideo (demux_t *demux, int fd, uint32_t caps)
 es_fmt.video.i_frame_rate_base = parm.parm.capture.timeperframe.numerator;
 GetAR (fd, _fmt.video.i_sar_num, _fmt.video.i_sar_den);
 
-msg_Dbg (demux, "added new video ES %4.4s %ux%u", (char *)_fmt.i_codec,
+msg_Dbg (demux, "added new video ES %4.4s %ux%u (%ux%u)",
+ (char *)_fmt.i_codec,
+ es_fmt.video.i_visible_width, es_fmt.video.i_visible_height,
  es_fmt.video.i_width, es_fmt.video.i_height);
 msg_Dbg (demux, " frame rate: %u/%u", es_fmt.video.i_frame_rate,
  es_fmt.video.i_frame_rate_base);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] wasapi: use one-time init rather than DllMain()

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sun Jun 
28 19:08:28 2015 +0300| [baa16ca4c818738c7f114d38c15c27c368330f90] | committer: 
Jean-Baptiste Kempf

wasapi: use one-time init rather than DllMain()

(cherry picked from commit 66302e2c16462072153ff85a621d83c0944a03dc)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=baa16ca4c818738c7f114d38c15c27c368330f90
---

 modules/audio_output/wasapi.c |   27 +++
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 7a47161..48f6d95 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  */
 
+#define _WIN32_WINNT 0x600
 #ifdef HAVE_CONFIG_H
 # include 
 #endif
@@ -35,25 +36,14 @@
 #include 
 #include "audio_output/mmdevice.h"
 
-static LARGE_INTEGER freq; /* performance counters frequency */
-
-BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID); /* avoid warning */
-
-BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved)
+static BOOL CALLBACK InitFreq(INIT_ONCE *once, void *param, void **context)
 {
-(void) dll;
-(void) reserved;
-
-switch (reason)
-{
-case DLL_PROCESS_ATTACH:
-if (!QueryPerformanceFrequency())
-return FALSE;
-break;
-}
-return TRUE;
+(void) once; (void) context;
+return QueryPerformanceFrequency(param);
 }
 
+static LARGE_INTEGER freq; /* performance counters frequency */
+
 static UINT64 GetQPC(void)
 {
 LARGE_INTEGER counter;
@@ -355,6 +345,11 @@ static HRESULT Start(aout_stream_t *s, 
audio_sample_format_t *restrict fmt,
 /* Fallback to other plugin until pass-through is implemented */
 return E_NOTIMPL;
 
+static INIT_ONCE freq_once = INIT_ONCE_STATIC_INIT;
+
+if (!InitOnceExecuteOnce(_once, InitFreq, , NULL))
+return E_FAIL;
+
 aout_stream_sys_t *sys = malloc(sizeof (*sys));
 if (unlikely(sys == NULL))
 return E_OUTOFMEMORY;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] twolame: use RECONF

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern  | Sat Aug  1 
09:31:03 2015 -0400| [2fae134d881d63412b9fb39f18fc94daa34d2d18] | committer: 
Jean-Baptiste Kempf

twolame: use RECONF

Signed-off-by: Rémi Denis-Courmont 
(cherry picked from commit 0ebac9dc833b9c4e667db44db452c2de0ddc7583)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2fae134d881d63412b9fb39f18fc94daa34d2d18
---

 contrib/src/twolame/rules.mak |1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/twolame/rules.mak b/contrib/src/twolame/rules.mak
index 7f3756d..5a85747 100644
--- a/contrib/src/twolame/rules.mak
+++ b/contrib/src/twolame/rules.mak
@@ -21,6 +21,7 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz .sum-twolame
$(MOVE)
 
 .twolame: twolame
+   $(RECONF)
cd $< && $(HOSTVARS) CFLAGS="${CFLAGS} -DLIBTWOLAME_STATIC" ./configure 
$(HOSTCONF)
cd $< && $(MAKE)
cd $https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix uninitialized members

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul 24 
16:59:51 2015 +0200| [05f32efdfd165d6e3e42880cfbd96e8b00cdc866] | committer: 
Jean-Baptiste Kempf

Qt: fix uninitialized members

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit c5664c66c44f1081f80db06895b2fc8f6246b04e)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=05f32efdfd165d6e3e42880cfbd96e8b00cdc866
---

 modules/gui/qt4/components/open_panels.cpp |4 
 1 file changed, 4 insertions(+)

diff --git a/modules/gui/qt4/components/open_panels.cpp 
b/modules/gui/qt4/components/open_panels.cpp
index e0b0b06..6ff18a6 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -716,6 +716,10 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, 
intf_thread_t *_p_intf ) :
 OpenPanel( _parent, _p_intf )
 {
 isInitialized = false;
+#ifdef _WIN32
+vdevDshowW = NULL;
+adevDshowW = NULL;
+#endif
 }
 
 void CaptureOpenPanel::initialize()

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sftp: do not close(-1)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Aug 
21 19:51:41 2015 +0300| [9b60d9b66e8220b86381e3b613f4873f8a9b8533] | committer: 
Jean-Baptiste Kempf

sftp: do not close(-1)

(cherry picked from commit 5a13c1fec1d8350d17b0d7999516383ab2a68238)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9b60d9b66e8220b86381e3b613f4873f8a9b8533
---

 modules/access/sftp.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index b4577ac..d8d132d 100644
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -257,7 +257,8 @@ error:
 free( psz_password );
 free( psz_username );
 vlc_UrlClean(  );
-net_Close( p_sys->i_socket );
+if( p_sys->i_socket >= 0 )
+net_Close( p_sys->i_socket );
 free( p_sys );
 return VLC_EGENERIC;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix NULL dereference on undescribed string var

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Mon Aug 
10 23:18:55 2015 +0200| [420c42512a9ce56bbf788e63e0ba070afcf3968b] | committer: 
Jean-Baptiste Kempf

Qt: fix NULL dereference on undescribed string var

(cherry picked from commit b5acac3bf0bce5e0d07a1cbe3e70ecd84dd05d84)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=420c42512a9ce56bbf788e63e0ba070afcf3968b
---

 modules/gui/qt4/components/preferences_widgets.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp 
b/modules/gui/qt4/components/preferences_widgets.cpp
index a79621b..8da328c 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -214,8 +214,8 @@ StringConfigControl::StringConfigControl( vlc_object_t 
*_p_this,
   bool pwd ) :
VStringConfigControl( _p_this, _p_item )
 {
-label = new QLabel( qtr(p_item->psz_text), _parent );
-text = new QLineEdit( qfu(p_item->value.psz), _parent );
+label = new QLabel( p_item->psz_text ? qtr(p_item->psz_text) : "", _parent 
);
+text = new QLineEdit( p_item->value.psz ? qfu(p_item->value.psz) : "", 
_parent );
 if( pwd ) text->setEchoMode( QLineEdit::Password );
 finish();
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] ncurses: fix NULL deref

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Aug 
21 20:07:49 2015 +0300| [412806b14a3dcc9c3652f7647df9296c86e78473] | committer: 
Jean-Baptiste Kempf

ncurses: fix NULL deref

in empty directory

(cherry picked from commit a3b0202259c36a225a472bad207599dcfe028c92)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=412806b14a3dcc9c3652f7647df9296c86e78473
---

 modules/gui/ncurses.c |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 7a4e175..291506a 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -303,10 +303,11 @@ static void ReadDir(intf_thread_t *intf)
 continue;
 }
 
-qsort(sys->dir_entries, sys->n_dir_entries,
-   sizeof(struct dir_entry_t*), _entries);
-
 closedir(current_dir);
+
+if (sys->n_dir_entries > 0)
+qsort(sys->dir_entries, sys->n_dir_entries,
+  sizeof(struct dir_entry_t*), _entries);
 }
 
 /*

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] taglib: fix memory leak

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sat Aug 
22 10:46:17 2015 +0300| [fcf65db177682ea042bf69997643b66628bfc2d1] | committer: 
Jean-Baptiste Kempf

taglib: fix memory leak

(cherry picked from commit 18a676c9e06fa1407b525b3c2337ada788aa06e8)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=fcf65db177682ea042bf69997643b66628bfc2d1
---

 modules/meta_engine/taglib.cpp |1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index f0c382e..669ff34 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -566,6 +566,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, 
demux_meta_t* p_demux_meta,
 /* TODO: Use i_cover_score / i_cover_idx to select the picture. */
 p_attachment = ParseFlacPicture( p_data, i_data, 0,
 _cover_score, _cover_idx );
+free( p_data );
 }
 
 TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] input: fix check for unnamed attachment, potential read overflow

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sat Aug 
15 13:19:39 2015 +0300| [6c9db1f8e848e00d927acef356155cc07221e9ae] | committer: 
Jean-Baptiste Kempf

input: fix check for unnamed attachment, potential read overflow

Pointed-out-by: 
(cherry picked from commit 12c11c31d9e791060f541eb5ca42c20f4c130ceb)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=6c9db1f8e848e00d927acef356155cc07221e9ae
---

 src/input/input.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index 9832ed1..6ca3cd9 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1037,7 +1037,7 @@ static void LoadSubtitles( input_thread_t *p_input )
 if( !a )
 continue;
 char *psz_mrl;
-if( a->psz_name[i] &&
+if( a->psz_name[0] &&
 asprintf( _mrl, "attachment://%s", a->psz_name ) >= 0 )
 {
 var_SetString( p_input, "sub-description", a->psz_description ? 
a->psz_description : "");

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Limit sigma range in gaussian blur

[Kaarlo Räihä]

vlc/vlc-2.2 | branch: master | Kaarlo Räihä  | Sat Aug 
22 13:57:48 2015 +0300| [51a401399abda225070b723f5e32ebc5c70b70c8] | committer: 
Jean-Baptiste Kempf

Limit sigma range in gaussian blur

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit a0dbb73f7678c697803741516c091dc843e5a67e)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=51a401399abda225070b723f5e32ebc5c70b70c8
---

 modules/video_filter/gaussianblur.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/video_filter/gaussianblur.c 
b/modules/video_filter/gaussianblur.c
index 3365ff6..5c85bba 100644
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -44,6 +44,9 @@
 static int  Create( vlc_object_t * );
 static void Destroy   ( vlc_object_t * );
 
+#define SIGMA_MIN (0.01)
+#define SIGMA_MAX (4096.0)
+
 #define SIGMA_TEXT N_("Gaussian's std deviation")
 #define SIGMA_LONGTEXT N_( \
 "Gaussian's standard deviation. The blurring will take " \
@@ -61,8 +64,9 @@ vlc_module_begin ()
 set_category( CAT_VIDEO )
 set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-add_float( FILTER_PREFIX "sigma", 2., SIGMA_TEXT, SIGMA_LONGTEXT,
-   false )
+add_float_with_range( FILTER_PREFIX "sigma", 2., SIGMA_MIN, SIGMA_MAX,
+  SIGMA_TEXT, SIGMA_LONGTEXT,
+  false )
 
 set_callbacks( Create, Destroy )
 vlc_module_end ()
@@ -159,7 +163,7 @@ static int Create( vlc_object_t *p_this )
 var_CreateGetFloat( p_filter, FILTER_PREFIX "sigma" );
 if( p_filter->p_sys->f_sigma <= 0. )
 {
-msg_Err( p_filter, "sigma must be positive" );
+msg_Err( p_filter, "sigma must be greater than zero" );
 return VLC_EGENERIC;
 }
 gaussianblur_InitDistribution( p_filter->p_sys );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] live555: retain query while concealing credentials (fixes #15365)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Thu Aug 
27 21:06:47 2015 +0300| [a4e44164665db05a55139623cb7834758703289c] | committer: 
Jean-Baptiste Kempf

live555: retain query while concealing credentials (fixes #15365)

Signed-off-by: Rémi Denis-Courmont 
(cherry picked from commit 0e4ff2698dfa0144a25d162a562603fda08412fa)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a4e44164665db05a55139623cb7834758703289c
---

 modules/access/live555.cpp |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index e8ba5a2..fba3b88 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -319,7 +319,7 @@ static int  Open ( vlc_object_t *p_this )
 p_sys->f_seek_request = -1;
 
 /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
-vlc_UrlParse( _sys->url, p_sys->psz_path, 0 );
+vlc_UrlParse( _sys->url, p_sys->psz_path, '?' );
 
 if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL )
 {
@@ -561,10 +561,12 @@ static int Connect( demux_t *p_demux )
 /* Create the URL by stripping away the username/password part */
 if( p_sys->url.i_port == 0 )
 p_sys->url.i_port = 554;
-if( asprintf( _url, "rtsp://%s:%d%s",
+if( asprintf( _url, "rtsp://%s:%d%s%s%s",
   strempty( p_sys->url.psz_host ),
   p_sys->url.i_port,
-  strempty( p_sys->url.psz_path ) ) == -1 )
+  strempty( p_sys->url.psz_path ),
+  p_sys->url.psz_option ? "?" : "",
+  strempty(p_sys->url.psz_option) ) == -1 )
 return VLC_ENOMEM;
 
 psz_user = strdup( strempty( p_sys->url.psz_username ) );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Thu Aug 27 
16:18:24 2015 +0200| [03a2fd67c15a8a5c5e1686752a298416f7e32d37] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leak

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 5a04c819b287918876c1b9f0f68753003ed8faa1)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=03a2fd67c15a8a5c5e1686752a298416f7e32d37
---

 modules/gui/qt4/components/preferences_widgets.cpp |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp 
b/modules/gui/qt4/components/preferences_widgets.cpp
index 8da328c..6cfb4bd 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -623,6 +623,8 @@ void ModuleListConfigControl::fillGrid( QGridLayout *l, int 
line )
 
 ModuleListConfigControl::~ModuleListConfigControl()
 {
+foreach ( checkBoxListItem *it, modules )
+free( it->psz_module );
 qDeleteAll( modules );
 modules.clear();
 delete groupBox;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: mp4: don't create twice track on restart

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Mon Jun  
8 12:44:05 2015 +0200| [3f83ba420115791e3db107e5f20bf44c60f88665] | committer: 
Jean-Baptiste Kempf

demux: mp4: don't create twice track on restart

(cherry picked from commit f6d41e3d5bb57be3fde6648f98c95a410a925c26)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3f83ba420115791e3db107e5f20bf44c60f88665
---

 modules/demux/mp4/mp4.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 58353eb..9ceb325 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3932,6 +3932,7 @@ static int ReInitDecoder( demux_t *p_demux, mp4_track_t 
*p_track )
 
 i_sample = p_track->i_sample;
 es_out_Del( p_demux->out, p_track->p_es );
+p_track->p_es = NULL;
 es_format_Clean( _track->fmt );
 
 if( b_smooth )
@@ -3945,8 +3946,8 @@ static int ReInitDecoder( demux_t *p_demux, mp4_track_t 
*p_track )
 p_track->b_selected = true;
 p_track->b_ok = true;
 p_track->b_enable = true;
-
-p_track->p_es = es_out_Add( p_demux->out, _track->fmt );
+if(!p_track->p_es)
+p_track->p_es = es_out_Add( p_demux->out, _track->fmt );
 p_track->b_codec_need_restart = false;
 
 return VLC_SUCCESS;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Map G2M3 and G2M2

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Wed 
Jul  1 15:52:38 2015 +0200| [c3850e1d336931e018fcb7ea7a8cfe49df3ee1bb] | 
committer: Jean-Baptiste Kempf

Map G2M3 and G2M2

Close #2327

(cherry picked from commit 6d383e69f980e97a61aab57c98955119eb266b93)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c3850e1d336931e018fcb7ea7a8cfe49df3ee1bb
---

 modules/codec/avcodec/fourcc.c |4 
 1 file changed, 4 insertions(+)

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index c6875d0..f88a75f 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -266,6 +266,10 @@ static const struct
 { VLC_CODEC_VP7 , AV_CODEC_ID_VP7, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_CHECK( 56, 31, 0, 46, 100 )
+{ VLC_CODEC_G2M2, AV_CODEC_ID_G2M, VIDEO_ES },
+{ VLC_CODEC_G2M3, AV_CODEC_ID_G2M, VIDEO_ES },
+#endif
 
 /* ffmpeg only: AV_CODEC_ID_BRENDER_PIX */
 /* ffmpeg only: AV_CODEC_ID_Y41P */

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
14:34:01 2015 +0200| [d1c15289b977e8507f4105a4aa76cfdaa827f379] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leak

Signed-off-by: Rémi Denis-Courmont 
(cherry picked from commit 1637cd913030e5fccf5f5aad37ad0dc22588f8e3)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=d1c15289b977e8507f4105a4aa76cfdaa827f379
---

 modules/gui/qt4/components/preferences_widgets.cpp |1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp 
b/modules/gui/qt4/components/preferences_widgets.cpp
index da724dc..a79621b 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -504,6 +504,7 @@ void setfillVLCConfigCombo( const char *configname, 
intf_thread_t *p_intf,
 free( texts[i] );
 }
 free( texts );
+free( values );
 }
 
 if( p_config->psz_longtext != NULL )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leaks

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
14:32:28 2015 +0200| [0c92770330556cd5b579ce4e38392b8f32d82018] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leaks

Signed-off-by: Rémi Denis-Courmont 
(cherry picked from commit 4a0dd7a7e818ab5c7bdabfbb8ad04d77eea1b170)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0c92770330556cd5b579ce4e38392b8f32d82018
---

 modules/gui/qt4/components/open_panels.cpp |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp 
b/modules/gui/qt4/components/open_panels.cpp
index 53059c9..92300be 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -340,7 +340,9 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, 
intf_thread_t *_p_intf ) :
 };
 QComboBox *discCombo = ui.deviceCombo; /* avoid namespacing in macro */
 POPULATE_WITH_DEVS( ppsz_discdevices, discCombo );
-int temp = ui.deviceCombo->findData( config_GetPsz( p_intf, "dvd" ), 
Qt::UserRole, Qt::MatchStartsWith );
+char *psz_config = config_GetPsz( p_intf, "dvd" );
+int temp = ui.deviceCombo->findData( psz_config, Qt::UserRole, 
Qt::MatchStartsWith );
+free( psz_config );
 if( temp != -1 )
 ui.deviceCombo->setCurrentIndex( temp );
 #endif
@@ -399,7 +401,9 @@ void DiscOpenPanel::onFocus()
 SetErrorMode(oldMode);
 }
 
-int temp = ui.deviceCombo->findData( config_GetPsz( p_intf, "dvd" ), 
Qt::UserRole, Qt::MatchStartsWith );
+char *psz_config = config_GetPsz( p_intf, "dvd" );
+int temp = ui.deviceCombo->findData( psz_config, Qt::UserRole, 
Qt::MatchStartsWith );
+free( psz_config );
 if( temp != -1 )
 ui.deviceCombo->setCurrentIndex( temp );
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leaks

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
14:33:20 2015 +0200| [6b19dc464b89ddfdf7626c0556145bfb9c8ad71a] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leaks

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit c64f324d74f86aa478c805a96584ec8adfb0f16d)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=6b19dc464b89ddfdf7626c0556145bfb9c8ad71a
---

 modules/gui/qt4/components/open_panels.cpp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp 
b/modules/gui/qt4/components/open_panels.cpp
index e9b9a1d..e0b0b06 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -385,13 +385,15 @@ void DiscOpenPanel::onFocus()
 wchar_t psz_name[512] = L"";
 GetVolumeInformationW( drive, psz_name, 511, NULL, NULL, NULL, 
NULL, 0 );
 
-QString displayName = FromWide( drive );
+char *psz_drive = FromWide( drive );
+QString displayName = psz_drive;
 char *psz_title = FromWide( psz_name );
 if( !EMPTY_STR(psz_title)) {
 displayName = displayName + " - "  + psz_title;
 }
 
-ui.deviceCombo->addItem( displayName, FromWide( drive ) );
+ui.deviceCombo->addItem( displayName, psz_drive );
+free( psz_drive );
 free( psz_title );
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] au: fix integer overflow

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Mon Aug 
31 19:02:50 2015 +0300| [bc0e933289b8efd6ef435f034cea599cc835171e] | committer: 
Jean-Baptiste Kempf

au: fix integer overflow

Header size can reach UINT32_MAX.

(cherry picked from commit af8f9bb6f5ad117fe73c9e5e523944cc942528df)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bc0e933289b8efd6ef435f034cea599cc835171e
---

 modules/demux/au.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/au.c b/modules/demux/au.c
index 19f8752..b9267ea 100644
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -90,7 +90,7 @@ struct demux_sys_t
 int i_frame_size;
 mtime_t i_frame_length;
 
-int i_header_size;
+uint32_ti_header_size;
 };
 
 static int Demux( demux_t * );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] gvfs: fix initial file size check

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Mon Aug 
31 18:34:01 2015 +0300| [f4aa31f77a67cfd159ed38e8116fb3e3c7e0ab38] | committer: 
Jean-Baptiste Kempf

gvfs: fix initial file size check

(cherry picked from commit 68dcab3d6ebf923e69b298d988703e500b9fc04c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f4aa31f77a67cfd159ed38e8116fb3e3c7e0ab38
---

 modules/access/gnomevfs.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index 9a07e46..e4d7f1a 100644
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -225,10 +225,11 @@ static int Open( vlc_object_t *p_this )
 return VLC_EGENERIC;
 }
 
-if( p_sys->b_seekable && !p_sys->p_file_info->size )
+if( p_sys->b_seekable
+&& !(p_sys->p_file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) )
 {
 /* FIXME that's bad because all others access will be probed */
-msg_Warn( p_access, "file %s is empty, aborting", psz_name );
+msg_Warn( p_access, "file %s size is unknown, aborting", psz_name );
 gnome_vfs_file_info_unref( p_sys->p_file_info );
 gnome_vfs_uri_unref( p_uri);
 free( p_sys );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sdp: fix potential read overflow and get rid of info.i_pos

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Tue Sep  
1 21:44:37 2015 +0300| [6b9014e314cfba2bb4734b29dc8e31b0198391b7] | committer: 
Jean-Baptiste Kempf

sdp: fix potential read overflow and get rid of info.i_pos

(cherry picked from commit 111382936de269a7c51a05d9f86b943ecd84210b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=6b9014e314cfba2bb4734b29dc8e31b0198391b7
---

 modules/access/sdp.c |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/modules/access/sdp.c b/modules/access/sdp.c
index 643be26..494a2fa 100644
--- a/modules/access/sdp.c
+++ b/modules/access/sdp.c
@@ -46,6 +46,7 @@ static int Control (access_t *, int, va_list);
 
 struct access_sys_t
 {
+size_t offset;
 size_t length;
 char   data[];
 };
@@ -60,6 +61,7 @@ static int Open (vlc_object_t *obj)
 return VLC_ENOMEM;
 
 /* NOTE: This copy is not really needed. Better safe than sorry. */
+sys->offset = 0;
 sys->length = len;
 memcpy (sys->data, access->psz_location, len);
 
@@ -85,22 +87,26 @@ static ssize_t Read (access_t *access, uint8_t *buf, size_t 
len)
 {
 access_sys_t *sys = access->p_sys;
 
-if (access->info.i_pos >= sys->length)
+if (sys->offset >= sys->length)
 {
 access->info.b_eof = true;
 return 0;
 }
 
-if (len > sys->length)
-len = sys->length;
-memcpy (buf, sys->data + access->info.i_pos, len);
-access->info.i_pos += len;
+if (len > sys->length - sys->offset)
+len = sys->length - sys->offset;
+memcpy (buf, sys->data + sys->offset, len);
 return len;
 }
 
 static int Seek (access_t *access, uint64_t position)
 {
-access->info.i_pos = position;
+access_sys_t *sys = access->p_sys;
+
+if (position > sys->length)
+position = sys->length;
+
+sys->offset = position;
 access->info.b_eof = false;
 return VLC_SUCCESS;
 }
@@ -129,6 +135,5 @@ static int Control (access_t *access, int query, va_list 
args)
 case ACCESS_SET_PAUSE_STATE:
 return VLC_SUCCESS;
 }
-(void) access;
 return VLC_EGENERIC;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] update: avoid division by zero

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Mon Aug 
31 20:11:52 2015 +0300| [eda813bdc0d1c20980ec978e92057d01227a0cbd] | committer: 
Jean-Baptiste Kempf

update: avoid division by zero

If the downloaded file is empty or of unknown size.

(cherry picked from commit 145b05739d2dc9607ead4ef8244ba2172d97b389)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=eda813bdc0d1c20980ec978e92057d01227a0cbd
---

 src/misc/update.c |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/misc/update.c b/src/misc/update.c
index e1257b7..9650313 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -472,7 +472,7 @@ bool update_NeedUpgrade( update_t *p_update )
  * \param l_size the size in bytes
  * \return the size as a string
  */
-static char *size_str( long int l_size )
+static char *size_str( uint64_t l_size )
 {
 char *psz_tmp = NULL;
 int i_retval = 0;
@@ -527,8 +527,8 @@ static void* update_DownloadReal( void *obj )
 {
 update_download_thread_t *p_udt = (update_download_thread_t *)obj;
 dialog_progress_bar_t *p_progress = NULL;
-long int l_size;
-long int l_downloaded = 0;
+uint64_t l_size;
+uint64_t l_downloaded = 0;
 float f_progress;
 char *psz_status;
 char *psz_downloaded = NULL;
@@ -557,7 +557,8 @@ static void* update_DownloadReal( void *obj )
 }
 
 /* Get the stream size */
-l_size = stream_Size( p_stream );
+if( stream_GetSize( p_stream, _size ) || l_size == 0 )
+goto end;
 
 /* Get the file name and open it*/
 psz_tmpdestfile = strrchr( p_update->release.psz_url, '/' );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/sidplay: fix openmode patch

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne  | Tue 
Jun 23 13:05:59 2015 +0200| [d0c37c2e94f0a473613b4463b3e2755f998f28cd] | 
committer: Jean-Baptiste Kempf

contrib/sidplay: fix openmode patch

_Ios_Openmode is an implementation detail of the GNU c++ stdlib whereas 
ios_base::openmode is the portable way to go

(cherry picked from commit 56b775d94fa351d797784f7f67a4bc78019111e9)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=d0c37c2e94f0a473613b4463b3e2755f998f28cd
---

 contrib/src/sidplay2/sidplay2-openmode.patch |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/sidplay2/sidplay2-openmode.patch 
b/contrib/src/sidplay2/sidplay2-openmode.patch
index 80a8e27..6e12d57 100644
--- a/contrib/src/sidplay2/sidplay2-openmode.patch
+++ b/contrib/src/sidplay2/sidplay2-openmode.patch
@@ -7,7 +7,7 @@
  
  // This sucks big time
 -openmode createAtrr = std::ios::in;
-+std::_Ios_Openmode createAtrr = std::ios::in;
++std::ios_base::openmode createAtrr = std::ios::in;
  #ifdef HAVE_IOS_NOCREATE
  createAtrr |= std::ios::nocreate;
  #endif
@@ -16,7 +16,7 @@
  {
  // Open binary output file stream.
 -openmode createAttr = std::ios::out;
-+std::_Ios_Openmode createAttr = std::ios::out;
++std::ios_base::openmode createAttr = std::ios::out;
  #if defined(HAVE_IOS_BIN)
  createAttr |= std::ios::bin;
  #else
@@ -25,7 +25,7 @@
  {
  // Open ASCII output file stream.
 -openmode createAttr = std::ios::out;
-+std::_Ios_Openmode createAttr = std::ios::out;
++std::ios_base::openmode createAttr = std::ios::out;
  if ( overWriteFlag )
  createAttr |= std::ios::trunc;
  else
@@ -34,7 +34,7 @@
  {
  // Open binary output file stream.
 -openmode createAttr = std::ios::out;
-+std::_Ios_Openmode createAttr = std::ios::out;
++std::ios_base::openmode createAttr = std::ios::out;
  #if defined(HAVE_IOS_BIN)
  createAttr |= std::ios::bin;
  #else

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avformat mux: use visible width/height for muxing

[Jan Ekström]

vlc/vlc-2.2 | branch: master | Jan Ekström  | Thu Jun 25 
01:54:19 2015 +0300| [4a6d40655336027aa0c84adf6ea9540ddaf7e8f6] | committer: 
Jean-Baptiste Kempf

avformat mux: use visible width/height for muxing

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 25987fd3bb07323b8ce6a31626413f8a42b6b479)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4a6d40655336027aa0c84adf6ea9540ddaf7e8f6
---

 modules/demux/avformat/mux.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 2974a6d..9b2d98c 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -248,8 +248,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t 
*p_input )
 
(double)fmt->video.i_frame_rate/(double)fmt->video.i_frame_rate_base );
 
 codec->codec_type = AVMEDIA_TYPE_VIDEO;
-codec->width = fmt->video.i_width;
-codec->height = fmt->video.i_height;
+codec->width = fmt->video.i_visible_width;
+codec->height = fmt->video.i_visible_height;
 av_reduce( >sample_aspect_ratio.num,
>sample_aspect_ratio.den,
fmt->video.i_sar_num,

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: don't map M3U to m3u8 extension (fix #15056)

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Fri Jul 
17 12:07:33 2015 +0200| [9e493c8ea4653e66c3d234da9e49e6ce4fba42cf] | committer: 
Jean-Baptiste Kempf

demux: don't map M3U to m3u8 extension (fix #15056)

Can't tell if that's m3u8 or hls without probing. Thanks Apple.

(cherry picked from commit b6afe6b4bb23889a6db8bd03e55629e609ac4270)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9e493c8ea4653e66c3d234da9e49e6ce4fba42cf
---

 src/input/demux.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index a0095ab..43f088b 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -113,7 +113,6 @@ demux_t *demux_New( vlc_object_t *p_obj, input_thread_t 
*p_parent_input,
 { "dv",   "dv" },
 { "drc",  "dirac" },
 { "m3u",  "m3u" },
-{ "m3u8", "m3u8" },
 { "mkv",  "mkv" }, { "mka",  "mkv" }, { "mks",  "mkv" },
 { "mp4",  "mp4" }, { "m4a",  "mp4" }, { "mov",  "mp4" }, { "moov", 
"mp4" },
 { "nsv",  "nsv" },

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avformat: fix memory leak

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Thu Aug 27 
16:18:22 2015 +0200| [3d46f2ea44e36a3c78d363c5139c7086c5d42362] | committer: 
Jean-Baptiste Kempf

avformat: fix memory leak

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 97020e0c02ee7b0e049bf6cfdf4574487948f84b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3d46f2ea44e36a3c78d363c5139c7086c5d42362
---

 modules/demux/avformat/demux.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 826b78e..9a1c415 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -270,7 +270,7 @@ int OpenDemux( vlc_object_t *p_this )
 p_sys->io_buffer = xmalloc( p_sys->io_buffer_size );
 
 p_sys->ic = avformat_alloc_context();
-p_sys->ic->pb = avio_alloc_context( p_sys->io_buffer,
+AVIOContext *pb = p_sys->ic->pb = avio_alloc_context( p_sys->io_buffer,
 p_sys->io_buffer_size, 0, p_demux, IORead, NULL, IOSeek );
 p_sys->ic->pb->seekable = b_can_seek ? AVIO_SEEKABLE_NORMAL : 0;
 error = avformat_open_input(_sys->ic, psz_url, p_sys->fmt, NULL);
@@ -279,6 +279,7 @@ int OpenDemux( vlc_object_t *p_this )
 {
 msg_Err( p_demux, "Could not open %s: %s", psz_url,
  vlc_strerror_c(AVUNERROR(error)) );
+av_free( pb );
 p_sys->ic = NULL;
 free( psz_url );
 CloseDemux( p_this );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leaks

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
14:35:22 2015 +0200| [9f790ebdb9741b2ecbeca59270bd208b99466551] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leaks

(cherry picked from commit cc04815c5e5cd7996a2da36d2b785a520ad8b4cd)
(cherry picked from commit 6dc0dc338b2b4962fa23f19dc35488eed896057c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9f790ebdb9741b2ecbeca59270bd208b99466551
---

 modules/gui/qt4/components/open_panels.cpp |4 
 1 file changed, 4 insertions(+)

diff --git a/modules/gui/qt4/components/open_panels.cpp 
b/modules/gui/qt4/components/open_panels.cpp
index 92300be..e9b9a1d 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1110,6 +1110,10 @@ void CaptureOpenPanel::initialize()
 
 CaptureOpenPanel::~CaptureOpenPanel()
 {
+#ifdef _WIN32
+delete vdevDshowW;
+delete adevDshowW;
+#endif
 }
 
 void CaptureOpenPanel::clear()

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/ass: use correct ASFLAGS for yasm on Solaris

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern  | Thu Jul  2 
19:02:17 2015 -0400| [5d099caff8a9978453e2294cd6860da0099f9636] | committer: 
Jean-Baptiste Kempf

contrib/ass: use correct ASFLAGS for yasm on Solaris

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 9ffab1842c77ffd8d524a975b0c4717c9e2ad453)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5d099caff8a9978453e2294cd6860da0099f9636
---

 contrib/src/ass/ass-solaris.patch |   11 +++
 contrib/src/ass/rules.mak |2 ++
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/ass/ass-solaris.patch 
b/contrib/src/ass/ass-solaris.patch
new file mode 100644
index 000..4e01b84
--- /dev/null
+++ b/contrib/src/ass/ass-solaris.patch
@@ -0,0 +1,11 @@
+--- libass/configure.ac.ORIG   Wed Jan  7 14:00:15 2015
 libass/configure.acThu Jul  2 18:57:07 2015
+@@ -70,7 +70,7 @@
+ AS_CASE([$host],
+ [*darwin*], [
+ ASFLAGS="$ASFLAGS -f macho$BITS -DPREFIX -DHAVE_ALIGNED_STACK=1" 
],
+-[*linux*|*dragonfly*|*bsd*], [
++[*linux*|*dragonfly*|*bsd*|*solaris*], [
+ ASFLAGS="$ASFLAGS -f elf -DHAVE_ALIGNED_STACK=1" ],
+ [*cygwin*|*mingw*], [
+ ASFLAGS="$ASFLAGS -f win$BITS"
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 155b971..b5139dc 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -33,6 +33,7 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
 libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(APPLY) $(SRC)/ass/ass-macosx.patch
+   $(APPLY) $(SRC)/ass/ass-solaris.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
 
@@ -53,6 +54,7 @@ ASS_CONF += --disable-harfbuzz
 endif
 
 .ass: libass
+   $(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) 
$(ASS_CONF)
cd $< && $(MAKE) install
touch $@

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] acoustid: remove superfluous checks

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Tue Jul  
7 19:05:16 2015 +0300| [048ce633eb6ecbb2a6b5c169954ea52da93f2b9e] | committer: 
Jean-Baptiste Kempf

acoustid: remove superfluous checks

(cherry picked from commit 8938474d84d6ec6141523326b6d85c9ae8ec7bcf)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=048ce633eb6ecbb2a6b5c169954ea52da93f2b9e
---

 modules/misc/webservices/acoustid.c |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/misc/webservices/acoustid.c 
b/modules/misc/webservices/acoustid.c
index f23be5a..47c1db2 100644
--- a/modules/misc/webservices/acoustid.c
+++ b/modules/misc/webservices/acoustid.c
@@ -158,10 +158,8 @@ static void cancelDoAcoustIdWebRequest( void *p_arg )
 struct webrequest_t *p_request = (struct webrequest_t *) p_arg;
 if ( p_request->p_stream )
 stream_Delete( p_request->p_stream );
-if ( p_request->psz_url )
-free( p_request->psz_url );
-if ( p_request->p_buffer )
-free( p_request->p_buffer );
+free( p_request->psz_url );
+free( p_request->p_buffer );
 }
 
 int DoAcoustIdWebRequest( vlc_object_t *p_obj, acoustid_fingerprint_t *p_data )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix memory leaks

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Fri Jul  3 
13:09:02 2015 +0200| [7b8c06a7b10283f9988d30320ee77bfd0ba213a5] | committer: 
Jean-Baptiste Kempf

Qt: fix memory leaks

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 27d4490a231f6260be2a5084cb04fa7ac403909c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=7b8c06a7b10283f9988d30320ee77bfd0ba213a5
---

 modules/gui/qt4/components/simple_preferences.cpp |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp 
b/modules/gui/qt4/components/simple_preferences.cpp
index 87cd67d..04c144b 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1028,6 +1028,7 @@ void SPrefsPanel::updateAudioOptions( int number)
 SPrefsPanel::~SPrefsPanel()
 {
 qDeleteAll( controls ); controls.clear();
+free( lang );
 }
 
 void SPrefsPanel::updateAudioVolume( int volume )
@@ -1202,6 +1203,7 @@ void SPrefsPanel::changeStyle( QString s_style )
 
 void SPrefsPanel::langChanged( int i )
 {
+free( lang );
 lang = strdup( ppsz_language[i] );
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] gme: limit to 16 MiB if file size is unknown

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Thu Jul 
23 22:39:34 2015 +0300| [0c225836002f1672adad9a983404ea44e09e1593] | committer: 
Jean-Baptiste Kempf

gme: limit to 16 MiB if file size is unknown

Allocating and reading 100 MiB at once for a remote file was a bit
excessive IMHO.

(cherry picked from commit 71d711709c8ad59b7468bc77ab1398ebdf9ff3d8)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0c225836002f1672adad9a983404ea44e09e1593
---

 modules/demux/gme.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/gme.c b/modules/demux/gme.c
index e50bd4a..4baa5a3 100644
--- a/modules/demux/gme.c
+++ b/modules/demux/gme.c
@@ -88,8 +88,8 @@ static int Open (vlc_object_t *obj)
 block_t *data = NULL;
 if (size <= 0)
 {
-data = stream_BlockRemaining (demux->s, 1);
-if (!data )
+data = stream_Block (demux->s, 1 << 24);
+if (data == NULL)
 return VLC_EGENERIC;
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] mkv: use stream_Size()

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Jul 
24 16:02:38 2015 +0300| [12f5dd9afe7c49c4ba33dde26ee593cdad5a27f3] | committer: 
Jean-Baptiste Kempf

mkv: use stream_Size()

(cherry picked from commit ea01e45fd13730c9b9a6c1d11903edfb17251303)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=12f5dd9afe7c49c4ba33dde26ee593cdad5a27f3
---

 modules/demux/mkv/stream_io_callback.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mkv/stream_io_callback.cpp 
b/modules/demux/mkv/stream_io_callback.cpp
index 7af0871..555cc9b 100644
--- a/modules/demux/mkv/stream_io_callback.cpp
+++ b/modules/demux/mkv/stream_io_callback.cpp
@@ -98,7 +98,7 @@ uint64 vlc_stream_io_callback::toRead( void )
 if( s == NULL)
 return 0;
 
-stream_Control( s, STREAM_GET_SIZE, _size );
+i_size = stream_Size( s );
 
 if( i_size == 0 )
 return UINT64_MAX;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avformat: fix heap read overflow and invalid cast

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Aug 
28 21:37:17 2015 +0300| [41503d6994ae0cd27a7564ba66e76a5d90adf332] | committer: 
Jean-Baptiste Kempf

avformat: fix heap read overflow and invalid cast

avformat needs nul padding after the probe data.

(cherry picked from commit 48a017006cc038c9783bccfc1d56f9ec2070fa54)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=41503d6994ae0cd27a7564ba66e76a5d90adf332
---

 modules/demux/avformat/demux.c |   33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index df92ea8..2b33de7 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -163,8 +163,24 @@ int OpenDemux( vlc_object_t *p_this )
 int64_t   i_start_time = -1;
 bool  b_can_seek;
 char *psz_url;
+const uint8_t *peek;
 int   error;
 
+/* Init Probe data */
+pd.buf_size = stream_Peek( p_demux->s, , 2048 + 213 );
+if( pd.buf_size <= 0 )
+{
+msg_Warn( p_demux, "cannot peek" );
+return VLC_EGENERIC;
+}
+
+pd.buf = malloc( pd.buf_size + AVPROBE_PADDING_SIZE );
+if( unlikely(pd.buf == NULL) )
+return VLC_ENOMEM;
+
+memcpy( pd.buf, peek, pd.buf_size );
+memset( pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE );
+
 if( p_demux->psz_file )
 psz_url = strdup( p_demux->psz_file );
 else
@@ -177,18 +193,13 @@ int OpenDemux( vlc_object_t *p_this )
 if( psz_url != NULL )
 msg_Dbg( p_demux, "trying url: %s", psz_url );
 
-/* Init Probe data */
 pd.filename = psz_url;
-if( ( pd.buf_size = stream_Peek( p_demux->s, (const uint8_t**), 
2048 + 213 ) ) <= 0 )
-{
-free( psz_url );
-msg_Warn( p_demux, "cannot peek" );
-return VLC_EGENERIC;
-}
+
 stream_Control( p_demux->s, STREAM_CAN_SEEK, _can_seek );
 
 vlc_init_avformat(p_this);
 
+/* Guess format */
 char *psz_format = var_InheritString( p_this, "avformat-format" );
 if( psz_format )
 {
@@ -197,8 +208,12 @@ int OpenDemux( vlc_object_t *p_this )
 free( psz_format );
 }
 
-/* Guess format */
-if( !fmt && !( fmt = av_probe_input_format( , 1 ) ) )
+if( fmt == NULL )
+fmt = av_probe_input_format( , 1 );
+
+free( pd.buf );
+
+if( fmt == NULL )
 {
 msg_Dbg( p_demux, "couldn't guess format" );
 free( psz_url );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: fix leak

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Sat Aug 
29 15:25:17 2015 +0300| [5dbb18c00dc656ac1b5e8b170eabe8bc58402af1] | committer: 
Jean-Baptiste Kempf

vout: fix leak

(cherry picked from commit 5b77eea208073723451c1515bb01490292216c0f)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5dbb18c00dc656ac1b5e8b170eabe8bc58402af1
---

 src/video_output/video_output.c |4 
 1 file changed, 4 insertions(+)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index bc1fd6c..ff1e96a 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1047,7 +1047,11 @@ static int ThreadDisplayRenderPicture(vout_thread_t 
*vout, bool is_forced)
 subpic = NULL;
 }
 if (!sys->display.filtered)
+{
+if (subpic != NULL)
+subpicture_Delete(subpic);
 return VLC_EGENERIC;
+}
 }
 
 vout_chrono_Stop(>p->render);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avformat: fix NULL dereference

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Fri Aug 
28 21:35:00 2015 +0300| [1bfd952f6295056240e0e2337f43807d95737732] | committer: 
Jean-Baptiste Kempf

avformat: fix NULL dereference

(cherry picked from commit 13ba7e5ea4524b029e30e526281b21aa7f75ab49)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1bfd952f6295056240e0e2337f43807d95737732
---

 modules/demux/avformat/demux.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 9a1c415..df92ea8 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -169,10 +169,14 @@ int OpenDemux( vlc_object_t *p_this )
 psz_url = strdup( p_demux->psz_file );
 else
 {
-if( asprintf( _url, "%s://%s", p_demux->psz_access, 
p_demux->psz_location ) == -1)
-return VLC_ENOMEM;
+if( asprintf( _url, "%s://%s", p_demux->psz_access,
+  p_demux->psz_location ) == -1)
+psz_url = NULL;
 }
-msg_Dbg( p_demux, "trying url: %s", psz_url );
+
+if( psz_url != NULL )
+msg_Dbg( p_demux, "trying url: %s", psz_url );
+
 /* Init Probe data */
 pd.filename = psz_url;
 if( ( pd.buf_size = stream_Peek( p_demux->s, (const uint8_t**), 
2048 + 213 ) ) <= 0 )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contribs: update libbluray to 0.9.0

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Sun 
Oct  4 17:27:55 2015 +0200| [143ce03f4f3af03ee119a3920e182bdfd5267282] | 
committer: Jean-Baptiste Kempf

Contribs: update libbluray to 0.9.0

(cherry picked from commit aa88324bb6f90c9688e605574dc166735865da8e)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=143ce03f4f3af03ee119a3920e182bdfd5267282
---

 contrib/src/bluray/SHA512SUMS |2 +-
 contrib/src/bluray/rules.mak  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/bluray/SHA512SUMS b/contrib/src/bluray/SHA512SUMS
index 3889535..51047b8 100644
--- a/contrib/src/bluray/SHA512SUMS
+++ b/contrib/src/bluray/SHA512SUMS
@@ -1 +1 @@
-6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc
  libbluray-0.8.1.tar.bz2
+12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec
  libbluray-0.9.0.tar.bz2
diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index e39581d..a3adda3 100644
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -1,12 +1,12 @@
 # LIBBLURAY
 
-BLURAY_VERSION := 0.8.1
+BLURAY_VERSION := 0.9.0
 BLURAY_URL := 
$(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 PKGS += bluray
 endif
-ifeq ($(call need_pkg,"libbluray >= 0.5.0"),)
+ifeq ($(call need_pkg,"libbluray >= 0.6.0"),)
 PKGS_FOUND += bluray
 endif
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] es_out: initialize video.i_visible_width/height

[Thomas Guillem]

vlc/vlc-2.2 | branch: master | Thomas Guillem  | Tue Oct  6 
11:31:51 2015 +0200| [48df071bcc09651d84e806042fa7d8668c2c78ef] | committer: 
Jean-Baptiste Kempf

es_out: initialize video.i_visible_width/height

(cherry picked from commit f7f1c524a9011c851d39d707e3b6bef433d38b75)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=48df071bcc09651d84e806042fa7d8668c2c78ef
---

 src/input/es_out.c |6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 324726d..b2b0988 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1444,6 +1444,12 @@ static es_out_id_t *EsOutAdd( es_out_t *out, const 
es_format_t *fmt )
 else
 es->fmt.i_codec = vlc_fourcc_GetCodec( es->fmt.i_cat,
es->fmt.i_codec );
+if( es->fmt.i_cat == VIDEO_ES
+ && (!es->fmt.video.i_visible_width || !es->fmt.video.i_visible_height))
+{
+es->fmt.video.i_visible_width = es->fmt.video.i_width;
+es->fmt.video.i_visible_height = es->fmt.video.i_height;
+}
 
 es->i_id = es->fmt.i_id;
 es->i_meta_id = out->p_sys->i_id;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/ffmpeg: disable videotoolbox decoder since we have our own

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne  | Mon 
Oct  5 19:23:10 2015 +0200| [ecbf8dd0585fcaca558859e85e9df7447f9eda28] | 
committer: Jean-Baptiste Kempf

contrib/ffmpeg: disable videotoolbox decoder since we have our own

(cherry picked from commit 7ddd72bf6eb3a9ef777183f50b6819b9cf8c5c97)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ecbf8dd0585fcaca558859e85e9df7447f9eda28
---

 contrib/src/ffmpeg/rules.mak |4 
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2f01fb9..e5387ed 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -34,6 +34,10 @@ ifdef USE_FFMPEG
 FFMPEGCONF += \
--disable-swresample \
--disable-iconv
+ifdef HAVE_DARWIN_OS
+FFMPEGCONF += \
+   --disable-videotoolbox
+endif
 endif
 
 DEPS_ffmpeg = zlib gsm openjpeg

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contribs: only force ass optimizations when WITH_OPTIMIZATION is set

[Steve Lhomme]

vlc/vlc-2.2 | branch: master | Steve Lhomme  | Fri Jul 31 
16:54:54 2015 +0200| [bb008ca656e1a12d8533509b6dcd78fb721262f2] | committer: 
Jean-Baptiste Kempf

contribs: only force ass optimizations when WITH_OPTIMIZATION is set

otherwise bring the debug symbols

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit a214613109809f72d1bd4ed8ba21ef0e967645d9)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bb008ca656e1a12d8533509b6dcd78fb721262f2
---

 contrib/src/ass/rules.mak |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index b5139dc..adb5d00 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -53,8 +53,14 @@ else
 ASS_CONF += --disable-harfbuzz
 endif
 
+ifdef WITH_OPTIMIZATION
+ASS_CFLAGS += -O3
+else
+ASS_CFLAGS += -g
+endif
+
 .ass: libass
$(RECONF)
-   cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) 
$(ASS_CONF)
+   cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure 
$(HOSTCONF) $(ASS_CONF)
cd $< && $(MAKE) install
touch $@

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] enable 'branding' by default

[Daniel Amm]

npapi-vlc | branch: master | Daniel Amm  | Tue Aug  4 
23:51:59 2015 +0200| [d2628c38ee45c769f972a4613822e1796af22284] | committer: 
Jean-Baptiste Kempf

enable 'branding' by default

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=d2628c38ee45c769f972a4613822e1796af22284
---

 common/vlc_player_options.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/vlc_player_options.h b/common/vlc_player_options.h
index 18b3fa0..09add1b 100644
--- a/common/vlc_player_options.h
+++ b/common/vlc_player_options.h
@@ -63,7 +63,7 @@ class vlc_player_options
 {
 public:
 vlc_player_options()
-:_autoplay(true), _show_toolbar(true), _enable_fullscreen(true), 
_enable_branding(false),
+:_autoplay(true), _show_toolbar(true), _enable_fullscreen(true), 
_enable_branding(true),
 _bg_color(/*black*/"#00")
{}
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix changing audio device

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Wed Oct 
21 20:42:58 2015 +0300| [994c11fb4c2d7c6af7b4e406d56fac72e95e7218] | committer: 
Jean-Baptiste Kempf

Qt: fix changing audio device

Change the audio device when the corresponding action is triggered, not
when it is modified... This completely broke ALSA playback.

(cherry picked from commit 7ac70075128318c51bbc1c0190482642f7a9226c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=994c11fb4c2d7c6af7b4e406d56fac72e95e7218
---

 modules/gui/qt4/menus.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 15a14b9..998bc80 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1583,7 +1583,7 @@ void VLCMenuBar::updateAudioDevice( intf_thread_t * 
p_intf, audio_output_t *p_ao
 action->setChecked( true );
 actionGroup->addAction( action );
 current->addAction( action );
-CONNECT(action, changed(), THEMIM->menusAudioMapper, map());
+CONNECT(action, triggered(), THEMIM->menusAudioMapper, map());
 THEMIM->menusAudioMapper->setMapping(action, ids[i]);
 free( ids[i] );
 free( names[i] );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: fix use-after-free, wait on correct date

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Wed Oct 21 
21:14:16 2015 +0300| [dfefe47ff25ace43f1ac1fad7fa652c8b99eb1f6] | committer: 
Rémi Denis-Courmont

vout: fix use-after-free, wait on correct date

The mwait() call dereferenced a potentially no longer referenced picture
(if the display was filtered).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dfefe47ff25ace43f1ac1fad7fa652c8b99eb1f6
---

 src/video_output/video_output.c |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 937b305..ae9edfe 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -981,6 +981,8 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, 
bool is_forced)
 subpicture_Delete(subpic);
 return VLC_EGENERIC;
 }
+
+todisplay = sys->display.filtered;
 }
 
 vout_chrono_Stop(>p->render);
@@ -1004,10 +1006,7 @@ static int ThreadDisplayRenderPicture(vout_thread_t 
*vout, bool is_forced)
 
 /* Display the direct buffer returned by vout_RenderPicture */
 vout->p->displayed.date = mdate();
-vout_display_Display(vd,
- sys->display.filtered ? sys->display.filtered
-: todisplay,
- subpic);
+vout_display_Display(vd, todisplay, subpic);
 sys->display.filtered = NULL;
 
 vout_statistic_AddDisplayed(>p->statistic, 1);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] libvlc media list player: attach observer after player instance creation

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne  | Thu 
Sep 10 13:40:26 2015 +0200| [133198d34b95c86164487412bf92ccbcd0f8f77e] | 
committer: Jean-Baptiste Kempf

libvlc media list player: attach observer after player instance creation

(cherry picked from commit 6a23d2cd782096110fc32a074d1083a5452fa38b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=133198d34b95c86164487412bf92ccbcd0f8f77e
---

 lib/media_list_player.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index 9ac935a..96f580e 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -464,6 +464,7 @@ libvlc_media_list_player_new(libvlc_instance_t * p_instance)
 free (p_mlp);
 return NULL;
 }
+install_media_player_observer(p_mlp);
 
 libvlc_retain(p_instance);
 p_mlp->p_libvlc_instance = p_instance;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: don't build the tests and doc for gnutls

[Steve Lhomme]

vlc/vlc-2.2 | branch: master | Steve Lhomme  | Mon Sep 14 
14:40:41 2015 +0200| [55ef14884908570bc24900d949d26754504bb496] | committer: 
Jean-Baptiste Kempf

contrib: don't build the tests and doc for gnutls

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit ce4010f25cc5f2ac53e77322d6e2b749506aa97b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=55ef14884908570bc24900d949d26754504bb496
---

 contrib/src/gnutls/rules.mak |2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 6f1390b..3091070 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -47,6 +47,8 @@ GNUTLS_CONF := \
--disable-guile \
--disable-nls \
--without-libintl-prefix \
+   --disable-doc \
+   --disable-tests \
$(HOSTCONF)
 
 DEPS_gnutls = nettle $(DEPS_nettle)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] aout: fix use after free

[Hannes Domani]

vlc/vlc-2.2 | branch: master | Hannes Domani  | Thu Aug 27 
16:18:26 2015 +0200| [19a5c9c49e7b69b412afaad99bba86dab534ce37] | committer: 
Jean-Baptiste Kempf

aout: fix use after free

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit e0457843005da71bfa119f9c1e4bd023a4761fce)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=19a5c9c49e7b69b412afaad99bba86dab534ce37
---

 src/audio_output/dec.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 2dfcff0..ef03894 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -92,6 +92,7 @@ int aout_DecNew( audio_output_t *p_aout,
 aout_OutputDelete (p_aout);
 error:
 aout_volume_Delete (owner->volume);
+owner->volume = NULL;
 aout_OutputUnlock (p_aout);
 return -1;
 }
@@ -119,6 +120,7 @@ void aout_DecDelete (audio_output_t *aout)
 aout_OutputDelete (aout);
 }
 aout_volume_Delete (owner->volume);
+owner->volume = NULL;
 aout_OutputUnlock (aout);
 var_Destroy (aout, "stereo-mode");
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] soundcloud.lua: rewrite for changes

[Pierre Ynard]

vlc/vlc-2.2 | branch: master | Pierre Ynard  | Sat Oct 17 
00:22:22 2015 +0200| [ef3a0af5c6887bb2f3b91d28d09e64efbb8eea40] | committer: 
Jean-Baptiste Kempf

soundcloud.lua: rewrite for changes

Complete rewrite due to website changes.

Based on reverse engineering by Daniel Ekmann, thanks!

(cherry picked from commit 98d7a343e3c19d455069762460841bef906fcc7c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ef3a0af5c6887bb2f3b91d28d09e64efbb8eea40
---

 share/lua/playlist/soundcloud.lua |   88 -
 1 file changed, 67 insertions(+), 21 deletions(-)

diff --git a/share/lua/playlist/soundcloud.lua 
b/share/lua/playlist/soundcloud.lua
index 6c1db69..0e0c629 100644
--- a/share/lua/playlist/soundcloud.lua
+++ b/share/lua/playlist/soundcloud.lua
@@ -1,9 +1,10 @@
 --[[
  $Id$
 
- Copyright © 2012 the VideoLAN team
+ Copyright © 2012, 2015 the VideoLAN team
 
  Authors: Cheng Sun 
+  Pierre Ynard
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -26,30 +27,75 @@ function probe()
 and string.match( vlc.path, "soundcloud%.com/.+/.+" )
 end
 
+function fix_quotes( value )
+if string.match( value, "^\"" ) then
+return "" -- field was really empty string
+end
+
+-- TODO: handle escaped backslashes and others
+return string.gsub( value, "\\\"", "\"" )
+end
+
 -- Parse function.
 function parse()
-if string.match ( vlc.path, "soundcloud%.com" ) then
-arturl = nil
-while true do
-line = vlc.readline()
-if not line then break end
-if string.match( line, "window%.SC%.bufferTracks%.push" ) then
--- all the data is nicely stored on this one line
-_,_,uid,token,name = string.find (line,
-"window%.SC%.bufferTracks%.push.*" ..
-"\"uid\":\"([^\"]*)\".*" ..
-"\"token\":\"([^\"]*)\".*" ..
-"\"title\":\"([^\"]*)\"")
--- we only want the first one of these lines
-break
+while true do
+line = vlc.readline()
+if not line then break end
+
+if not path then
+local track = string.match( line, "soundcloud:tracks:(%d+)" )
+if track then
+-- API magic
+local client_id = "02gUJC0hH2ct1EGOcYXQIzRFU91c72Ea"
+-- app_version is not required by the API but we send it
+-- anyway to remain unconspicuous
+local app_version = "a089efd"
+
+local api = vlc.stream( 
"https://api.soundcloud.com/i1/tracks/"..track.."/streams?client_id="..client_id.."_version="..app_version
 )
+if not api then
+break
+end
+
+local streams = api:readline() -- data is on one line only
+-- For now only quality available is 128 kbps 
(http_mp3_128_url)
+path = string.match( streams, "[\"']http_mp3_%d+_url[\"'] *: 
*[\"'](.-)[\"']" )
+if path then
+-- FIXME: do this properly
+path = string.gsub( path, "\\u0026", "&" )
+end
+end
+end
+
+if not name then
+name = string.match( line, "[\"']title[\"'] *: *\"(.-[^\\])\"" )
+if name then
+name = fix_quotes( name )
 end
--- try to get the art url
-if string.match( line, "artwork--download--link" ) then
-_,_,arturl = string.find( line, " href=\"(.*)\" " )
+end
+
+if not description then
+description = string.match( line, "[\"']artwork_url[\"'] 
*:.-[\"']description[\"'] *: *\"(.-[^\\])\"" )
+if description then
+description = fix_quotes( description )
+end
+end
+
+if not artist then
+artist = string.match( line, "[\"']username[\"'] *: 
*\"(.-[^\\])\"" )
+if artist then
+artist = fix_quotes( artist )
 end
 end
-path = 
"http://media.soundcloud.com/stream/"..uid.."?stream_token="..token
-return { { path = path; name = name; arturl = arturl } }
+
+if not arturl then
+arturl = string.match( line, "[\"']artwork_url[\"'] *: 
*[\"'](.-)[\"']" )
+end
 end
-return {}
+
+if not path then
+vlc.msg.err( "Couldn't extract soundcloud audio URL, please check for 
updates to this script" )
+return { }
+end
+
+return { { path = path, name = name, description = description, artist = 
artist, arturl = arturl } }
 end

___
vlc-commits mailing list
vlc-commits@videolan.org

[vlc-commits] contrib: update libebml to 1.3.2

[Steve Lhomme]

vlc/vlc-2.2 | branch: master | Steve Lhomme  | Sat Oct 17 
17:40:12 2015 +0200| [78b27a9ebc1225513a6b887d8f27b175f662ffd2] | committer: 
Jean-Baptiste Kempf

contrib: update libebml to 1.3.2

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit c18ac66a08dd0ffb7aedd2b9c0a4c3af6a0a7a98)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=78b27a9ebc1225513a6b887d8f27b175f662ffd2
---

 contrib/src/ebml/SHA512SUMS |2 +-
 contrib/src/ebml/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ebml/SHA512SUMS b/contrib/src/ebml/SHA512SUMS
index 981da1d..1d9ef4a 100644
--- a/contrib/src/ebml/SHA512SUMS
+++ b/contrib/src/ebml/SHA512SUMS
@@ -1 +1 @@
-b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334
  libebml-1.3.1.tar.bz2
+b40ead62bf0f3768d0e669b96ee5b059f43eb1d77d35c8b7b738cd4b727195f61a681ba87f1fa0bf9844a93807e40442db8f8d549e76922b75880c83fd2678d3
  libebml-1.3.2.tar.bz2
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 4a5ac16..2c857a9 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -1,6 +1,6 @@
 # ebml
 
-EBML_VERSION := 1.3.1
+EBML_VERSION := 1.3.2
 EBML_URL := 
http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
 #EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] playlist: Fetcher: Fix leak

[Hugo Beauzée-Luyssen]

vlc/vlc-2.2 | branch: master | Hugo Beauzée-Luyssen  | Tue Oct 
20 17:01:39 2015 +0200| [5c57ebeea44a31c8a5ae648dc004787b4d0c4fd1] | committer: 
Jean-Baptiste Kempf

playlist: Fetcher: Fix leak

(cherry picked from commit f96d78321a3a26cf0f70a8677894a83a7adefe30)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5c57ebeea44a31c8a5ae648dc004787b4d0c4fd1
---

 src/playlist/fetcher.c |8 
 1 file changed, 8 insertions(+)

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index 41e0c32..a8b7b11 100644
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -169,6 +169,14 @@ void playlist_fetcher_Delete( playlist_fetcher_t 
*p_fetcher )
 vlc_cond_destroy( _fetcher->wait );
 vlc_mutex_destroy( _fetcher->lock );
 
+playlist_album_t album;
+FOREACH_ARRAY( album, p_fetcher->albums )
+free( album.psz_album );
+free( album.psz_artist );
+free( album.psz_arturl );
+FOREACH_END()
+ARRAY_RESET( p_fetcher->albums );
+
 free( p_fetcher );
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: update libmatroska to 1.4.3

[Steve Lhomme]

vlc/vlc-2.2 | branch: master | Steve Lhomme  | Sat Oct 17 
17:40:13 2015 +0200| [e00d084d5d491afe33ef34178922d6a342a14600] | committer: 
Jean-Baptiste Kempf

contrib: update libmatroska to 1.4.3

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 690711f5f933d137771d3d21e6c0065a3067c0df)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e00d084d5d491afe33ef34178922d6a342a14600
---

 contrib/src/matroska/SHA512SUMS |2 +-
 contrib/src/matroska/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS
index 91cdc48..628801b 100644
--- a/contrib/src/matroska/SHA512SUMS
+++ b/contrib/src/matroska/SHA512SUMS
@@ -1 +1 @@
-37b7e35c4db0a5265682f69e2ded251168f64499ab86fa228d9a4dde8a85edab7b8b60c722563c1fed27317cd0e94ee86322c18446430aae7cafeda20a90e549
  libmatroska-1.4.2.tar.bz2
+0413ddf09297d1bcc94ba5d102778dd9f18d8c4ca902bd74d85a9c0e0d7237154f219190dbd89d5e1a5f221940333594db912231537d9496b843eeac0c790afb
  libmatroska-1.4.3.tar.bz2
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index c71ee83..12576db 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.4.2
+MATROSKA_VERSION := 1.4.3
 MATROSKA_URL := 
http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] doc: install liveleak.lua sample script instead of soundcloud.lua

[Pierre Ynard]

vlc/vlc-2.2 | branch: master | Pierre Ynard  | Sat Oct 17 
00:35:26 2015 +0200| [bfbdaae8c81a1680b508059c6d0636ea7acf865b] | committer: 
Jean-Baptiste Kempf

doc: install liveleak.lua sample script instead of soundcloud.lua

soundcloud.lua is no longer the trivial example it was before

(cherry picked from commit 18994ecded0c9d2ce72608f86fbd2cc7575cf238)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bfbdaae8c81a1680b508059c6d0636ea7acf865b
---

 share/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 105ed0c..029c9f4 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -167,7 +167,7 @@ nobase_doc_DATA = \
lua/meta/reader/README.txt \
lua/meta/reader/filename.lua \
lua/playlist/README.txt \
-   lua/playlist/soundcloud.lua \
+   lua/playlist/liveleak.lua \
lua/playlist/youtube.lua \
lua/sd/README.txt \
lua/sd/icecast.lua \

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contribs: D3D, use wine headers when Xcompilign

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Wed 
Jun 17 20:59:05 2015 +0200| [44f025851cd94940fa560a09519a28058fbc102f] | 
committer: Jean-Baptiste Kempf

Contribs: D3D, use wine headers when Xcompilign

(cherry picked from commit bbf89a9fc7a3321894637be7588c34764464399b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=44f025851cd94940fa560a09519a28058fbc102f
---

 contrib/src/d3d11/rules.mak |4 
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index 92f5ca1..7d6be2d 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -1,7 +1,11 @@
 # generate Direct3D11 temporary include
 
+ifdef HAVE_CROSS_COMPILE
+IDL_INC_PATH = /usr/include/wine/windows/
+else
 #ugly way to get the default location of standard idl files
 IDL_INC_PATH = /`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include
+endif
 
 D3D11_IDL_URL 
:=http://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/direct-x/include/d3d11.idl?format=raw
 DST_D3D11_H = $(PREFIX)/include/d3d11.h

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: update d3d11.idl checksum and patch

[Petri Hintukainen]

vlc/vlc-2.2 | branch: master | Petri Hintukainen  | Mon Oct 
 5 11:58:59 2015 +0300| [dc8baddd4470c7915ee7f83f4b71de086cfc51f9] | committer: 
Jean-Baptiste Kempf

contrib: update d3d11.idl checksum and patch

Maybe it would be better to download specific revision instead of HEAD (?).

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 9c039ddb541709ac2dc9ac3ac35fc72e0299f21e)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=dc8baddd4470c7915ee7f83f4b71de086cfc51f9
---

 contrib/src/d3d11/SHA512SUMS   |2 +-
 contrib/src/d3d11/id3d11videodecoder.patch |  144 +---
 2 files changed, 2 insertions(+), 144 deletions(-)

diff --git a/contrib/src/d3d11/SHA512SUMS b/contrib/src/d3d11/SHA512SUMS
index 20e4d85..7706843 100644
--- a/contrib/src/d3d11/SHA512SUMS
+++ b/contrib/src/d3d11/SHA512SUMS
@@ -1,2 +1,2 @@
-257664deade110fb0ad00d4c408b320768d9c470892bfe2b4f756a23fb828b6bd7b28dd670ff5f90edcf7b5eed56a6cc10af030f5d69f4be19ea7e376d1b6e1a
  d3d11.idl
+6b6b845d9a75e4f66cf1225b28c75f8eed93931e94c182c7211e2747c70fbc97eab551dded77327ac0c0b48b037e630cc96d796be5f341a7e3bd9e7fcc30bf96
  d3d11.idl
 
04b208ddf9c91f923d262ae68a5fb0588a3ef1a39ea450eaac9031e021bd5efdc7b30e3fb3e589b07bc88e41f8861caeb56934a2fa6cbf2efb7404f5f3453b70
  dxgidebug.idl
diff --git a/contrib/src/d3d11/id3d11videodecoder.patch 
b/contrib/src/d3d11/id3d11videodecoder.patch
index 27f29c8..1f193e9 100644
--- a/contrib/src/d3d11/id3d11videodecoder.patch
+++ b/contrib/src/d3d11/id3d11videodecoder.patch
@@ -1,52 +1,10 @@
 diff --git a/d3d11.idl b/d3d11.idl
 --- a/d3d11.idl
 +++ b/d3d11.idl
-@@ -2125,6 +2125,214 @@ interface ID3D11Device : IUnknown
+@@ -2125,6 +2125,72 @@ interface ID3D11Device : IUnknown
  UINT GetExceptionMode();
  }
 
-+typedef enum D3D11_VDOV_DIMENSION
-+{
-+D3D11_VDOV_DIMENSION_UNKNOWN = 0,
-+D3D11_VDOV_DIMENSION_TEXTURE2D
-+} D3D11_VDOV_DIMENSION;
-+
-+typedef struct D3D11_TEX2D_VDOV
-+{
-+UINT ArraySlice;
-+} D3D11_TEX2D_VDOV;
-+
-+typedef struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC
-+{
-+GUID DecodeProfile;
-+D3D11_VDOV_DIMENSION ViewDimension;
-+
-+union
-+{
-+D3D11_TEX2D_VDOV Texture2D;
-+};
-+} D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC;
-+
-+[
-+object,
-+local,
-+uuid(c2931aea-2a85-4f20-860f-fba1fd256e18)
-+]
-+interface ID3D11VideoDecoderOutputView : ID3D11View
-+{
-+void GetDesc(
-+[out] D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc );
-+}
-+
-+[
-+object,
-+local,
-+uuid(3c9c5b51-995d-48d1-9b8d-fa5caeded65c)
-+]
-+interface ID3D11VideoDecoder : ID3D11DeviceChild
-+{
-+}
-+
 +typedef enum D3D11_VIDEO_DECODER_BUFFER_TYPE
 +{
 +D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0,
@@ -113,106 +71,6 @@ diff --git a/d3d11.idl b/d3d11.idl
 +[in] const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc);
 +}
 +
-+typedef struct D3D11_VIDEO_DECODER_DESC
-+{
-+GUID Guid;
-+UINT SampleWidth;
-+UINT SampleHeight;
-+DXGI_FORMAT OutputFormat;
-+} D3D11_VIDEO_DECODER_DESC;
-+
-+typedef struct D3D11_VIDEO_DECODER_CONFIG
-+{
-+GUID guidConfigBitstreamEncryption;
-+GUID guidConfigMBcontrolEncryption;
-+GUID guidConfigResidDiffEncryption;
-+UINT ConfigBitstreamRaw;
-+UINT ConfigMBcontrolRasterOrder;
-+UINT ConfigResidDiffHost;
-+UINT ConfigSpatialResid8;
-+UINT ConfigResid8Subtraction;
-+UINT ConfigSpatialHost8or9Clipping;
-+UINT ConfigSpatialResidInterleaved;
-+UINT ConfigIntraResidUnsigned;
-+UINT ConfigResidDiffAccelerator;
-+UINT ConfigHostInverseScan;
-+UINT ConfigSpecificIDCT;
-+UINT Config4GroupedCoefs;
-+USHORT ConfigMinRenderTargetBuffCount;
-+USHORT ConfigDecoderSpecific;
-+} D3D11_VIDEO_DECODER_CONFIG;
-+
-+typedef enum D3D11_AUTHENTICATED_CHANNEL_TYPE
-+{
-+D3D11_AUTHENTICATED_CHANNEL_D3D11 = 1,
-+D3D11_AUTHENTICATED_CHANNEL_DRIVER_SOFTWARE,
-+D3D11_AUTHENTICATED_CHANNEL_DRIVER_HARDWARE
-+} D3D11_AUTHENTICATED_CHANNEL_TYPE;
-+
-+interface ID3D11VideoProcessorEnumerator;
-+interface ID3D11VideoProcessor;
-+interface ID3D11VideoProcessorInputView;
-+interface ID3D11VideoProcessorOutputView;
-+interface ID3D11AuthenticatedChannel;
-+interface ID3D11CryptoSession;
-+
-+[
-+object,
-+local,
-+uuid(10ec4d5b-975a-4689-b9e4-d0aac30fe333)
-+]
-+interface ID3D11VideoDevice : IUnknown
-+{
-+HRESULT CreateVideoDecoder(
-+[in] const D3D11_VIDEO_DECODER_DESC *pVideoDesc,
-+[in] const D3D11_VIDEO_DECODER_CONFIG *pConfig,
-+[out] ID3D11VideoDecoder **ppVideoDecoder);
-+HRESULT CreateVideoProcessor(
-+[in] ID3D11VideoProcessorEnumerator *ppProcEnumerator,
-+[in] UINT RateConversionIndex,
-+[out] ID3D11VideoProcessor **ppVideoProcessor);
-+HRESULT CreateAuthenticatedChannel(
-+[in] D3D11_AUTHENTICATED_CHANNEL_TYPE ChannelType,
-+[out] 

[vlc-commits] contrib: d3d11: checksum patched files

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré  | Mon Aug 10 
17:36:53 2015 +0200| [9f7783f7adc359ea7a51cd166215531f041dd7f0] | committer: 
Jean-Baptiste Kempf

contrib: d3d11: checksum patched files

(cherry picked from commit b23811f30f2f627fae4247b896c09e3777e128ac)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9f7783f7adc359ea7a51cd166215531f041dd7f0
---

 contrib/src/d3d11/SHA512SUMS |2 ++
 contrib/src/d3d11/rules.mak  |2 ++
 2 files changed, 4 insertions(+)

diff --git a/contrib/src/d3d11/SHA512SUMS b/contrib/src/d3d11/SHA512SUMS
new file mode 100644
index 000..20e4d85
--- /dev/null
+++ b/contrib/src/d3d11/SHA512SUMS
@@ -0,0 +1,2 @@
+257664deade110fb0ad00d4c408b320768d9c470892bfe2b4f756a23fb828b6bd7b28dd670ff5f90edcf7b5eed56a6cc10af030f5d69f4be19ea7e376d1b6e1a
  d3d11.idl
+04b208ddf9c91f923d262ae68a5fb0588a3ef1a39ea450eaac9031e021bd5efdc7b30e3fb3e589b07bc88e41f8861caeb56934a2fa6cbf2efb7404f5f3453b70
  dxgidebug.idl
diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index 7d6be2d..1d7124a 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -23,6 +23,8 @@ $(TARBALLS)/d3d11.idl:
 $(TARBALLS)/dxgidebug.idl:
(cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgidebug.patch
 
+.sum-d3d11: $(TARBALLS)/d3d11.idl $(TARBALLS)/dxgidebug.idl
+
 $(DST_D3D11_H): $(TARBALLS)/d3d11.idl
$(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contrib: prefix widl tool

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Wed 
Jun 17 20:56:56 2015 +0200| [aa457ac0484dc3288b7c1fe5dc397a4cf136a996] | 
committer: Jean-Baptiste Kempf

Contrib: prefix widl tool

(cherry picked from commit 764c24daa96c312c9fbc684bee919d9fdcbd36a3)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=aa457ac0484dc3288b7c1fe5dc397a4cf136a996
---

 contrib/src/d3d11/rules.mak |4 ++--
 contrib/src/main.mak|6 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index a5b9c87..92f5ca1 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -20,10 +20,10 @@ $(TARBALLS)/dxgidebug.idl:
(cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgidebug.patch
 
 $(DST_D3D11_H): $(TARBALLS)/d3d11.idl
-   widl -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
+   $(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 
 $(DST_DXGIDEBUG_H): $(TARBALLS)/dxgidebug.idl
-   widl -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
+   $(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $<
 
 .d3d11: $(DST_D3D11_H) $(DST_DXGIDEBUG_H)
touch $@
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c9f409a..d3be485 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -69,6 +69,9 @@ endif
 ifneq ($(findstring $(origin STRIP),undefined default),)
 STRIP := strip
 endif
+ifneq ($(findstring $(origin WIDL),undefined default),)
+WIDL := widl
+endif
 else
 ifneq ($(findstring $(origin CC),undefined default),)
 CC := $(HOST)-gcc
@@ -88,6 +91,9 @@ endif
 ifneq ($(findstring $(origin STRIP),undefined default),)
 STRIP := $(HOST)-strip
 endif
+ifneq ($(findstring $(origin WIDL),undefined default),)
+WIDL := $(HOST)-widl
+endif
 endif
 
 ifdef HAVE_ANDROID

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: reorder code

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Wed Oct 21 
21:20:23 2015 +0300| [604913343e6c7106f15f0fe3b8261ffb642e89bf] | committer: 
Rémi Denis-Courmont

vout: reorder code

No functional changes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=604913343e6c7106f15f0fe3b8261ffb642e89bf
---

 src/video_output/video_output.c |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index ae9edfe..095e7f3 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -965,16 +965,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, 
bool is_forced)
 vout_display_Prepare(vd, todisplay, subpic);
 } else {
 sys->display.filtered = vout_FilterDisplay(vd, todisplay);
-if (sys->display.filtered) {
-if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
-picture_BlendSubpicture(sys->display.filtered, 
vout->p->spu_blend, subpic);
-vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic 
: NULL);
-}
-if (!do_dr_spu && subpic)
-{
-subpicture_Delete(subpic);
-subpic = NULL;
-}
 if (!sys->display.filtered)
 {
 if (subpic != NULL)
@@ -982,6 +972,16 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, 
bool is_forced)
 return VLC_EGENERIC;
 }
 
+if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
+picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, 
subpic);
+vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : 
NULL);
+
+if (!do_dr_spu && subpic)
+{
+subpicture_Delete(subpic);
+subpic = NULL;
+}
+
 todisplay = sys->display.filtered;
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: remove useless filtered picture pointer

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Wed Oct 21 
21:21:39 2015 +0300| [aa2bcbfd793c0d0fd43913a85e531ef394babf77] | committer: 
Rémi Denis-Courmont

vout: remove useless filtered picture pointer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa2bcbfd793c0d0fd43913a85e531ef394babf77
---

 src/video_output/video_output.c  |   11 ---
 src/video_output/vout_internal.h |1 -
 src/video_output/vout_wrapper.c  |2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 095e7f3..08b7bed 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -964,8 +964,8 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, 
bool is_forced)
 if (sys->display.use_dr) {
 vout_display_Prepare(vd, todisplay, subpic);
 } else {
-sys->display.filtered = vout_FilterDisplay(vd, todisplay);
-if (!sys->display.filtered)
+todisplay = vout_FilterDisplay(vd, todisplay);
+if (todisplay == NULL)
 {
 if (subpic != NULL)
 subpicture_Delete(subpic);
@@ -973,16 +973,14 @@ static int ThreadDisplayRenderPicture(vout_thread_t 
*vout, bool is_forced)
 }
 
 if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
-picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, 
subpic);
-vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : 
NULL);
+picture_BlendSubpicture(todisplay, vout->p->spu_blend, subpic);
+vout_display_Prepare(vd, todisplay, do_dr_spu ? subpic : NULL);
 
 if (!do_dr_spu && subpic)
 {
 subpicture_Delete(subpic);
 subpic = NULL;
 }
-
-todisplay = sys->display.filtered;
 }
 
 vout_chrono_Stop(>p->render);
@@ -1007,7 +1005,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t 
*vout, bool is_forced)
 /* Display the direct buffer returned by vout_RenderPicture */
 vout->p->displayed.date = mdate();
 vout_display_Display(vd, todisplay, subpic);
-sys->display.filtered = NULL;
 
 vout_statistic_AddDisplayed(>p->statistic, 1);
 
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 75320f8..4d63fbf 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -81,7 +81,6 @@ struct vout_thread_sys_t
 char   *title;
 vout_display_t *vd;
 bool   use_dr;
-picture_t  *filtered;
 } display;
 
 struct {
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index dbaae78..ce622b3 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -160,7 +160,6 @@ int vout_InitWrapper(vout_thread_t *vout)
 NoDrInit(vout);
 }
 sys->private_pool = picture_pool_Reserve(sys->decoder_pool, 
private_picture);
-sys->display.filtered = NULL;
 return VLC_SUCCESS;
 }
 
@@ -171,7 +170,6 @@ void vout_EndWrapper(vout_thread_t *vout)
 {
 vout_thread_sys_t *sys = vout->p;
 
-assert(!sys->display.filtered);
 if (sys->private_pool)
 picture_pool_Release(sys->private_pool);
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avformat: set stream time_base and not codec

[Ilkka Ollakka]

vlc/vlc-2.2 | branch: master | Ilkka Ollakka  | Sun Aug  9 
00:39:49 2015 +0300| [819e16b47904d0781b722d7b8a80efd23da74409] | committer: 
Jean-Baptiste Kempf

avformat: set stream time_base and not codec

(cherry picked from commit 74e427d4b7d9bf5ccd9ceecc9b7937a4b3cbf372)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=819e16b47904d0781b722d7b8a80efd23da74409
---

 modules/demux/avformat/mux.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 9b2d98c..21e95b8 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -228,7 +228,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t 
*p_input )
 codec->codec_type = AVMEDIA_TYPE_AUDIO;
 codec->channels = fmt->audio.i_channels;
 codec->sample_rate = fmt->audio.i_rate;
-codec->time_base = (AVRational){1, codec->sample_rate};
+stream->time_base = (AVRational){1, codec->sample_rate};
 codec->frame_size = fmt->audio.i_frame_length;
 if (fmt->i_bitrate == 0) {
 msg_Warn( p_mux, "Missing audio bitrate, assuming 64k" );
@@ -258,8 +258,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t 
*p_input )
 fmt->video.i_sar_num, fmt->video.i_sar_den);
 stream->sample_aspect_ratio.den = codec->sample_aspect_ratio.den;
 stream->sample_aspect_ratio.num = codec->sample_aspect_ratio.num;
-codec->time_base.den = fmt->video.i_frame_rate;
-codec->time_base.num = fmt->video.i_frame_rate_base;
+stream->time_base.den = fmt->video.i_frame_rate;
+stream->time_base.num = fmt->video.i_frame_rate_base;
 if (fmt->i_bitrate == 0) {
 msg_Warn( p_mux, "Missing video bitrate, assuming 512k" );
 fmt->i_bitrate = 512000;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] gitignore: Be more lax with the build folders

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Fri 
Oct  9 14:18:57 2015 +0200| [3b697bb7829487c585b2306a89e993354379412b] | 
committer: Jean-Baptiste Kempf

gitignore: Be more lax with the build folders

(cherry picked from commit 99fff2293b1084d205e427acc9cd72b44b79b5d0)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3b697bb7829487c585b2306a89e993354379412b
---

 .gitignore |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a9d0c62..f7509ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,7 @@ patches/*
 include/vlc/libvlc_version.h
 
 # Ignore build dirs
-build-*
+build*
 contrib-*
 install-*
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: flac: simplify .pc patching

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré  | Tue Nov 25 
12:54:29 2014 +0100| [78c3a6967a2970bc50f53e045f6fc7c98c18f29e] | committer: 
Jean-Baptiste Kempf

contrib: flac: simplify .pc patching

dependency on ogg is already specified

(cherry picked from commit ea1c1c6198d1fbfa6d990ae6ac7653492fef41c6)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=78c3a6967a2970bc50f53e045f6fc7c98c18f29e
---

 contrib/src/flac/libFLAC-pc.patch |   10 --
 contrib/src/flac/rules.mak|2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/contrib/src/flac/libFLAC-pc.patch 
b/contrib/src/flac/libFLAC-pc.patch
deleted file mode 100644
index 8b5105a..000
--- a/contrib/src/flac/libFLAC-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 flac/src/libFLAC/flac.pc.in.orig   2013-05-05 14:05:30.059024229 +0200
-+++ flac/src/libFLAC/flac.pc.in2013-05-05 14:06:25.529822137 +0200
-@@ -7,6 +7,6 @@
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
- Requires.private: @OGG_PACKAGE@
--Libs: -L${libdir} -lFLAC
-+Libs: -L${libdir} -lFLAC -logg
- Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index b27a5f5..53cf8e0 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -15,7 +15,6 @@ $(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
 
 flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
$(UNPACK)
-   $(APPLY) $(SRC)/flac/libFLAC-pc.patch
 ifdef HAVE_DARWIN_OS
cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' 
-i.orig configure
 endif
@@ -26,6 +25,7 @@ ifeq ($(ANDROID_ABI), x86)
cd $(UNPACK_DIR) && sed -i.orig -e s/"#  undef 
USE_OBSOLETE_SIGCONTEXT_FLAVOR"/"#define USE_OBSOLETE_SIGCONTEXT_FLAVOR"/g 
src/libFLAC/cpu.c
 endif
 endif
+   $(call pkg_static,"src/libFLAC/flac.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix changing audio device

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Wed Oct 21 
20:42:58 2015 +0300| [7ac70075128318c51bbc1c0190482642f7a9226c] | committer: 
Rémi Denis-Courmont

Qt: fix changing audio device

Change the audio device when the corresponding action is triggered, not
when it is modified... This completely broke ALSA playback.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ac70075128318c51bbc1c0190482642f7a9226c
---

 modules/gui/qt4/menus.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 9b27f32..f7f84eb 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1556,7 +1556,7 @@ void VLCMenuBar::updateAudioDevice( intf_thread_t * 
p_intf, audio_output_t *p_ao
 action->setChecked( true );
 actionGroup->addAction( action );
 current->addAction( action );
-CONNECT(action, changed(), THEMIM->menusAudioMapper, map());
+CONNECT(action, triggered(), THEMIM->menusAudioMapper, map());
 THEMIM->menusAudioMapper->setMapping(action, ids[i]);
 free( ids[i] );
 free( names[i] );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] alsa: insert default choice if not in ALSA device hints

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont  | Wed Oct 21 
20:30:49 2015 +0300| [1d92fdf3e259b0f8d482b4a5534022cdc71fea16] | committer: 
Rémi Denis-Courmont

alsa: insert default choice if not in ALSA device hints

This ensures that the default value ("default") for alsa-audio-device
is listed as a possible choice.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d92fdf3e259b0f8d482b4a5534022cdc71fea16
---

 modules/audio_output/alsa.c |   14 ++
 1 file changed, 14 insertions(+)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 7e71d3e..42c1d75 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -709,6 +709,7 @@ static int EnumDevices(vlc_object_t *obj, char const 
*varname,
 
 char **ids = NULL, **names = NULL;
 unsigned n = 0;
+bool hinted_default = false;
 
 for (size_t i = 0; hints[i] != NULL; i++)
 {
@@ -729,9 +730,22 @@ static int EnumDevices(vlc_object_t *obj, char const 
*varname,
 ids[n] = name;
 names[n] = desc;
 n++;
+
+if (!strcmp(name, "default"))
+hinted_default = true;
 }
 
 snd_device_name_free_hint(hints);
+
+if (!hinted_default)
+{
+ids = xrealloc (ids, (n + 1) * sizeof (*ids));
+names = xrealloc (names, (n + 1) * sizeof (*names));
+ids[n] = xstrdup ("default");
+names[n] = _("Default");
+n++;
+}
+
 *idp = ids;
 *namep = names;
 (void) varname;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: fix error message for media information panel

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Wed Oct 21 
22:35:05 2015 +0200| [10145e039042c1a15e92b47d7e88f1d632d9c6a1] | committer: 
David Fuhrmann

macosx: fix error message for media information panel

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10145e039042c1a15e92b47d7e88f1d632d9c6a1
---

 modules/gui/macosx/VLCPlaylistInfo.m |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCPlaylistInfo.m 
b/modules/gui/macosx/VLCPlaylistInfo.m
index d0755e7..1c971f2 100644
--- a/modules/gui/macosx/VLCPlaylistInfo.m
+++ b/modules/gui/macosx/VLCPlaylistInfo.m
@@ -359,9 +359,9 @@
 return;
 
 error:
-NSRunAlertPanel(_NS("Error while saving meta"),
-@"%@",_NS("VLC was unable to save the meta data."),
-_NS("OK"), nil, nil);
+NSRunAlertPanel(_NS("Error while saving meta"), @"%@",
+_NS("OK"), nil, nil,
+_NS("VLC was unable to save the meta data."));
 }
 
 - (IBAction)downloadCoverArt:(id)sender

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: mp4: reset current position context after failed read

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed Oct 21 
22:31:10 2015 +0200| [8e18ce4793067d2040aee50860ea6ee970301cb8] | committer: 
Francois Cartegnie

demux: mp4: reset current position context after failed read

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e18ce4793067d2040aee50860ea6ee970301cb8
---

 modules/demux/mp4/mp4.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 74ac7ce..4bb5349 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -4818,6 +4818,7 @@ error:
 msg_Err( p_demux, "mdat had still %"PRIu32" bytes unparsed as samples",
  p_sys->context.i_mdatbytesleft );
 stream_ReadU32( p_demux->s, NULL, p_sys->context.i_mdatbytesleft );
+p_sys->context.i_mdatbytesleft = 0;
 }
 p_sys->context.i_current_box_type = 0;
 
@@ -5052,6 +5053,7 @@ end:
 {
 msg_Warn( p_demux, "mdat had still %"PRIu32" bytes unparsed as 
samples", p_sys->context.i_mdatbytesleft - 8 );
 stream_ReadU32( p_demux->s, NULL, p_sys->context.i_mdatbytesleft );
+p_sys->context.i_mdatbytesleft = 0;
 }
 
 p_sys->context.i_current_box_type = 0;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: mp4: reset current position context after failed read

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Wed Oct 
21 22:31:10 2015 +0200| [d946714922e665f87d4495b08174103dc093a97b] | committer: 
Jean-Baptiste Kempf

demux: mp4: reset current position context after failed read

(cherry picked from commit 8e18ce4793067d2040aee50860ea6ee970301cb8)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=d946714922e665f87d4495b08174103dc093a97b
---

 modules/demux/mp4/mp4.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 9ceb325..944d39b 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -5150,6 +5150,7 @@ error:
 msg_Err( p_demux, "mdat had still %"PRIu32" bytes unparsed as samples",
  p_sys->context.i_mdatbytesleft );
 stream_ReadU32( p_demux->s, NULL, p_sys->context.i_mdatbytesleft );
+p_sys->context.i_mdatbytesleft = 0;
 }
 p_sys->context.i_current_box_type = 0;
 
@@ -5374,6 +5375,7 @@ end:
 {
 msg_Warn( p_demux, "mdat had still %"PRIu32" bytes unparsed as 
samples", p_sys->context.i_mdatbytesleft - 8 );
 stream_ReadU32( p_demux->s, NULL, p_sys->context.i_mdatbytesleft );
+p_sys->context.i_mdatbytesleft = 0;
 }
 
 p_sys->context.i_current_box_type = 0;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Revert "update: avoid division by zero"

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Wed 
Oct 21 22:58:00 2015 +0200| [a45232aaa5e4c6dbb762a77df2b712550ac2cfce] | 
committer: Jean-Baptiste Kempf

Revert "update: avoid division by zero"

This reverts commit eda813bdc0d1c20980ec978e92057d01227a0cbd.

This cannot compile, sorry...

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a45232aaa5e4c6dbb762a77df2b712550ac2cfce
---

 src/misc/update.c |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/misc/update.c b/src/misc/update.c
index 9650313..e1257b7 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -472,7 +472,7 @@ bool update_NeedUpgrade( update_t *p_update )
  * \param l_size the size in bytes
  * \return the size as a string
  */
-static char *size_str( uint64_t l_size )
+static char *size_str( long int l_size )
 {
 char *psz_tmp = NULL;
 int i_retval = 0;
@@ -527,8 +527,8 @@ static void* update_DownloadReal( void *obj )
 {
 update_download_thread_t *p_udt = (update_download_thread_t *)obj;
 dialog_progress_bar_t *p_progress = NULL;
-uint64_t l_size;
-uint64_t l_downloaded = 0;
+long int l_size;
+long int l_downloaded = 0;
 float f_progress;
 char *psz_status;
 char *psz_downloaded = NULL;
@@ -557,8 +557,7 @@ static void* update_DownloadReal( void *obj )
 }
 
 /* Get the stream size */
-if( stream_GetSize( p_stream, _size ) || l_size == 0 )
-goto end;
+l_size = stream_Size( p_stream );
 
 /* Get the file name and open it*/
 psz_tmpdestfile = strrchr( p_update->release.psz_url, '/' );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] alsa: insert default choice if not in ALSA device hints

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont  | Wed Oct 
21 20:30:49 2015 +0300| [e563b2afd5d8df191d4197a57a584e81e5654d01] | committer: 
Jean-Baptiste Kempf

alsa: insert default choice if not in ALSA device hints

This ensures that the default value ("default") for alsa-audio-device
is listed as a possible choice.

(cherry picked from commit 1d92fdf3e259b0f8d482b4a5534022cdc71fea16)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e563b2afd5d8df191d4197a57a584e81e5654d01
---

 modules/audio_output/alsa.c |   14 ++
 1 file changed, 14 insertions(+)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 7e71d3e..42c1d75 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -709,6 +709,7 @@ static int EnumDevices(vlc_object_t *obj, char const 
*varname,
 
 char **ids = NULL, **names = NULL;
 unsigned n = 0;
+bool hinted_default = false;
 
 for (size_t i = 0; hints[i] != NULL; i++)
 {
@@ -729,9 +730,22 @@ static int EnumDevices(vlc_object_t *obj, char const 
*varname,
 ids[n] = name;
 names[n] = desc;
 n++;
+
+if (!strcmp(name, "default"))
+hinted_default = true;
 }
 
 snd_device_name_free_hint(hints);
+
+if (!hinted_default)
+{
+ids = xrealloc (ids, (n + 1) * sizeof (*ids));
+names = xrealloc (names, (n + 1) * sizeof (*names));
+ids[n] = xstrdup ("default");
+names[n] = _("Default");
+n++;
+}
+
 *idp = ids;
 *namep = names;
 (void) varname;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits