[vlc-commits] NSIS: use 64bits registry for uninstaller too

2013-07-10 Thread Rafaël Carré 
vlc | branch: master | Rafaël Carré  | Thu Jul 11 08:04:38 
2013 +0200| [37f1c06e61deb09948436ac7d115ed4d029334d7] | committer: Rafaël Carré

NSIS: use 64bits registry for uninstaller too

Fixes #7409

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

 extras/package/win32/NSIS/vlc.win32.nsi.in |1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in 
b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 106661c..4772718 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -832,6 +832,7 @@ UAC_ElevationAborted:
 Abort
 
 UAC_Success:
+@HAVE_WIN64_TRUE@ SetRegView 64
 StrCmp 1 $3 +4
 StrCmp 3 $1 0 UAC_ElevationAborted
 MessageBox mb_iconstop "This installer requires admin access, try again"

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

[vlc-commits] Check element size before reading it

2013-07-10 Thread Denis Charmet 
vlc/vlc-2.0 | branch: master | Denis Charmet  | Wed Jul 10 
23:09:59 2013 +0200| [487cf6e4f5694fcc0c6da9263e56ae67069315b1] | committer: 
Denis Charmet

Check element size before reading it

This should avoid integer overflows inside the libebml causing heap buffer 
overflow. Since new called by the lib is limited to SIZE_MAX bytes.
(cherry picked from commit 027380966251622435288af5b0f9bacfec549288)

Conflicts:
modules/demux/mkv/matroska_segment.cpp

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

 modules/demux/mkv/demux.cpp  |5 
 modules/demux/mkv/matroska_segment.cpp   |   35 -
 modules/demux/mkv/matroska_segment_parse.cpp |   36 ++
 3 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 225d34e..2035d82 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -525,6 +525,11 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( 
demux_t *p_demux, EbmlS
 // find the families of this segment
 KaxInfo *p_info = static_cast(p_l1);
 b_keep_segment = b_initial;
+if( unlikely( p_info->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( p_demux, "KaxInfo too big aborting" );
+break;
+}
 try
 {
 p_info->Read(*p_estream, EBML_CLASS_CONTEXT(KaxInfo), 
i_upper_lvl, p_l2, true);
diff --git a/modules/demux/mkv/matroska_segment.cpp 
b/modules/demux/mkv/matroska_segment.cpp
index c607db0..e820cfb 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -152,6 +152,12 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 KaxCueTime &ctime = *(KaxCueTime*)el;
 try
 {
+if( unlikely( ctime.GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "CueTime size too big");
+b_invalid_cue = true;
+break;
+}
 ctime.ReadData( es.I_O() );
 }
 catch(...)
@@ -169,10 +175,17 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 {
 while( ( el = ep->Get() ) != NULL )
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+ep->Up();
+msg_Err( &sys.demuxer, "Error %s too big, 
aborting", typeid(*el).name() );
+b_invalid_cue = true;
+break;
+}
+
 if( MKV_IS_ID( el, KaxCueTrack ) )
 {
 KaxCueTrack &ctrack = *(KaxCueTrack*)el;
-
 ctrack.ReadData( es.I_O() );
 idx.i_track = uint16( ctrack );
 }
@@ -279,6 +292,14 @@ void matroska_segment_c::ParseSimpleTags( KaxTagSimple 
*tag )
 {
 while( ( el = ep->Get() ) != NULL )
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Error %s too big ignoring the tag", 
typeid(*el).name() );
+delete ep;
+free(k);
+free(v);
+return ;
+}
 if( MKV_IS_ID( el, KaxTagName ) )
 {
 KaxTagName &key = *(KaxTagName*)el;
@@ -1563,6 +1584,12 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, 
KaxSimpleBlock * & pp_s
 }
 break;
 case 2:
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Error while reading %s... 
upping level", typeid(*el).name());
+ep->Up();
+break;
+}
 if( MKV_IS_ID( el, KaxClusterTimecode ) )
 {
 KaxClusterTimecode &ctc = *(KaxClusterTimecode*)el;
@@ -1594,6 +1621,12 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, 
KaxSimpleBlock * & pp_s
 }
 break;
 case 3:
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Error while reading %s... 
upping level", typeid(*el).name());
+ep->Up();
+break;
+

[vlc-commits] MKV: remove unused variable

2013-07-10 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Mon 
Apr  9 23:38:21 2012 +0200| [94afe3410997a933ddb6fb1db0c442bd4576d674] | 
committer: Denis Charmet

MKV: remove unused variable
(cherry picked from commit f5bb58e308b5b595b11b129490d5981a10992b66)

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

 modules/demux/mkv/demux.cpp |1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 47c0f99..0d747b6 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -463,7 +463,6 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( 
demux_t *p_demux, EbmlS
 bool b_keep_stream = false, b_keep_segment = false;
 
 // verify the EBML Header
-vlc_stream_io_callback & io_stream = (vlc_stream_io_callback &) 
p_estream->I_O();
 p_l0 = p_estream->FindNextID(EBML_INFO(EbmlHead), UINT64_MAX);
 if (p_l0 == NULL)
 {

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

[vlc-commits] Add try/catch when reading elements with libmatroska.

2013-07-10 Thread Denis Charmet 
vlc/vlc-2.0 | branch: master | Denis Charmet  | Sat Apr 27 
02:44:32 2013 +0200| [55d4d4713bba02ebc7c5e16d67704ead08f40a79] | committer: 
Denis Charmet

Add try/catch when reading elements with libmatroska.
(cherry picked from commit 59c9e8309d5b435a2d85c2c9eaae979ba56ccdd9)

Conflicts:
modules/demux/mkv/matroska_segment.cpp

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

 modules/demux/mkv/demux.cpp  |   27 ++-
 modules/demux/mkv/matroska_segment.cpp   |  306 +++---
 modules/demux/mkv/matroska_segment_parse.cpp |  130 +++
 3 files changed, 286 insertions(+), 177 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=55d4d4713bba02ebc7c5e16d67704ead08f40a79
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Update NEWS

2013-07-10 Thread Denis Charmet 
vlc/vlc-2.1 | branch: master | Denis Charmet  | Thu Jul 11 
00:57:12 2013 +0200| [ca87bf02eec046c2d85fbd74bda4a802db3631b0] | committer: 
Denis Charmet

Update NEWS
(cherry picked from commit 976d8b00b2fec646bc697a8560dc8262e65659f2)

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

 NEWS |3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 497ac23..96ee7ae 100644
--- a/NEWS
+++ b/NEWS
@@ -65,6 +65,9 @@ Demuxers:
  * Support for more MJPEG streams
  * Add support for liveleak streams
  * Add support for Wave/RF64 files
+ * Prevent numerous uncaught exceptions in MKV causing the 
+   program to terminate.
+ * Add protection against several heap buffer overflow in libebml
 
 Audio output:
  * Windows Audio Session API audio output support

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

[vlc-commits] Update NEWS

2013-07-10 Thread Denis Charmet 
vlc | branch: master | Denis Charmet  | Thu Jul 11 00:57:12 
2013 +0200| [976d8b00b2fec646bc697a8560dc8262e65659f2] | committer: Denis 
Charmet

Update NEWS

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

 NEWS |3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index c9ebed9..626744d 100644
--- a/NEWS
+++ b/NEWS
@@ -68,6 +68,9 @@ Demuxers:
  * Support for more MJPEG streams
  * Add support for liveleak streams
  * Add support for Wave/RF64 files
+ * Prevent numerous uncaught exceptions in MKV causing the 
+   program to terminate.
+ * Add protection against several heap buffer overflow in libebml
 
 Audio output:
  * Windows Audio Session API audio output support

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

[vlc-commits] Check element size before reading it

2013-07-10 Thread Denis Charmet 
vlc/vlc-2.1 | branch: master | Denis Charmet  | Wed Jul 10 
23:09:59 2013 +0200| [c37ab274d859c33cbcfb10a6879c70ff9345857d] | committer: 
Denis Charmet

Check element size before reading it

This should avoid integer overflows inside the libebml causing heap buffer 
overflow. Since new called by the lib is limited to SIZE_MAX bytes.
(cherry picked from commit 027380966251622435288af5b0f9bacfec549288)

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

 modules/demux/mkv/demux.cpp  |5 +++
 modules/demux/mkv/matroska_segment.cpp   |   42 --
 modules/demux/mkv/matroska_segment_parse.cpp |   36 ++
 3 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 8a913df..be20476 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -527,6 +527,11 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( 
demux_t *p_demux, EbmlS
 // find the families of this segment
 KaxInfo *p_info = static_cast(p_l1);
 b_keep_segment = b_initial;
+if( unlikely( p_info->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( p_demux, "KaxInfo too big aborting" );
+break;
+}
 try
 {
 p_info->Read(*p_estream, EBML_CLASS_CONTEXT(KaxInfo), 
i_upper_lvl, p_l2, true);
diff --git a/modules/demux/mkv/matroska_segment.cpp 
b/modules/demux/mkv/matroska_segment.cpp
index fa477fe..9f00f42 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -138,6 +138,12 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 KaxCueTime &ctime = *(KaxCueTime*)el;
 try
 {
+if( unlikely( ctime.GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "CueTime size too big");
+b_invalid_cue = true;
+break;
+}
 ctime.ReadData( es.I_O() );
 }
 catch(...)
@@ -155,10 +161,17 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 {
 while( ( el = ep->Get() ) != NULL )
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+ep->Up();
+msg_Err( &sys.demuxer, "Error %s too big, 
aborting", typeid(*el).name() );
+b_invalid_cue = true;
+break;
+}
+
 if( MKV_IS_ID( el, KaxCueTrack ) )
 {
 KaxCueTrack &ctrack = *(KaxCueTrack*)el;
-
 ctrack.ReadData( es.I_O() );
 idx.i_track = uint16( ctrack );
 }
@@ -270,6 +283,13 @@ SimpleTag * matroska_segment_c::ParseSimpleTags( 
KaxTagSimple *tag, int target_t
 {
 while( ( el = ep->Get() ) != NULL )
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Error %s too big ignoring the tag", 
typeid(*el).name() );
+delete ep;
+delete p_simple;
+return NULL;
+}
 if( MKV_IS_ID( el, KaxTagName ) )
 {
 KaxTagName &key = *(KaxTagName*)el;
@@ -376,6 +396,11 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
 {
 try
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Invalid size while 
reading tag");
+break;
+}
 if( MKV_IS_ID( el, KaxTagTargetTypeValue ) )
 {
 KaxTagTargetTypeValue &value = 
*(KaxTagTargetTypeValue*)el;
@@ -421,11 +446,10 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
 catch(...)
 {
 msg_Err( &sys.demuxer, "Error while reading tag");
-ep->Up();
 break;
 }
-ep->Up();
 }
+ep->Up();
 }
 else if( MKV_IS_ID( el, KaxTagSimple ) )
 {
@@ -1296,6 +1320,12 @@ int matroska_segm

[vlc-commits] Check element size before reading it

2013-07-10 Thread Denis Charmet 
vlc | branch: master | Denis Charmet  | Wed Jul 10 23:09:59 
2013 +0200| [027380966251622435288af5b0f9bacfec549288] | committer: Denis 
Charmet

Check element size before reading it

This should avoid integer overflows inside the libebml causing heap buffer 
overflow. Since new called by the lib is limited to SIZE_MAX bytes.

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

 modules/demux/mkv/demux.cpp  |5 +++
 modules/demux/mkv/matroska_segment.cpp   |   42 --
 modules/demux/mkv/matroska_segment_parse.cpp |   36 ++
 3 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 8a913df..be20476 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -527,6 +527,11 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( 
demux_t *p_demux, EbmlS
 // find the families of this segment
 KaxInfo *p_info = static_cast(p_l1);
 b_keep_segment = b_initial;
+if( unlikely( p_info->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( p_demux, "KaxInfo too big aborting" );
+break;
+}
 try
 {
 p_info->Read(*p_estream, EBML_CLASS_CONTEXT(KaxInfo), 
i_upper_lvl, p_l2, true);
diff --git a/modules/demux/mkv/matroska_segment.cpp 
b/modules/demux/mkv/matroska_segment.cpp
index fa477fe..9f00f42 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -138,6 +138,12 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 KaxCueTime &ctime = *(KaxCueTime*)el;
 try
 {
+if( unlikely( ctime.GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "CueTime size too big");
+b_invalid_cue = true;
+break;
+}
 ctime.ReadData( es.I_O() );
 }
 catch(...)
@@ -155,10 +161,17 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 {
 while( ( el = ep->Get() ) != NULL )
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+ep->Up();
+msg_Err( &sys.demuxer, "Error %s too big, 
aborting", typeid(*el).name() );
+b_invalid_cue = true;
+break;
+}
+
 if( MKV_IS_ID( el, KaxCueTrack ) )
 {
 KaxCueTrack &ctrack = *(KaxCueTrack*)el;
-
 ctrack.ReadData( es.I_O() );
 idx.i_track = uint16( ctrack );
 }
@@ -270,6 +283,13 @@ SimpleTag * matroska_segment_c::ParseSimpleTags( 
KaxTagSimple *tag, int target_t
 {
 while( ( el = ep->Get() ) != NULL )
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Error %s too big ignoring the tag", 
typeid(*el).name() );
+delete ep;
+delete p_simple;
+return NULL;
+}
 if( MKV_IS_ID( el, KaxTagName ) )
 {
 KaxTagName &key = *(KaxTagName*)el;
@@ -376,6 +396,11 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
 {
 try
 {
+if( unlikely( el->GetSize() >= SIZE_MAX ) )
+{
+msg_Err( &sys.demuxer, "Invalid size while 
reading tag");
+break;
+}
 if( MKV_IS_ID( el, KaxTagTargetTypeValue ) )
 {
 KaxTagTargetTypeValue &value = 
*(KaxTagTargetTypeValue*)el;
@@ -421,11 +446,10 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
 catch(...)
 {
 msg_Err( &sys.demuxer, "Error while reading tag");
-ep->Up();
 break;
 }
-ep->Up();
 }
+ep->Up();
 }
 else if( MKV_IS_ID( el, KaxTagSimple ) )
 {
@@ -1296,6 +1320,12 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, 
KaxSimpleBlock * & pp_s

[vlc-commits] ALSA: only set channels that are actually mapped (fixes #8934)

2013-07-10 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Wed Jul 10 
23:24:47 2013 +0300| [d3a43ec88f34eca9c59151c076bb7226a9db5d8c] | committer: 
Rémi Denis-Courmont

ALSA: only set channels that are actually mapped (fixes #8934)

The code failed to clear unmapped channels present in the input.

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

 modules/audio_output/alsa.c |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 350d509..9a231aa 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -207,19 +207,21 @@ static int Map2Mask (vlc_object_t *obj, const 
snd_pcm_chmap_t *restrict map)
  * Compares a fixed ALSA channels map with the VLC channels order.
  */
 static unsigned SetupChannelsFixed(const snd_pcm_chmap_t *restrict map,
-uint16_t *restrict mask, uint8_t *restrict tab)
+   uint16_t *restrict maskp, uint8_t *restrict tab)
 {
 uint32_t chans_out[AOUT_CHAN_MAX];
+uint16_t mask = 0;
 
 for (unsigned i = 0; i < map->channels; i++)
 {
 uint_fast16_t vlc_chan = vlc_chans[map->pos[i]];
 
 chans_out[i] = vlc_chan;
-*mask |= vlc_chan;
+mask |= vlc_chan;
 }
 
-return aout_CheckChannelReorder(NULL, chans_out, *mask, tab);
+*maskp = mask;
+return aout_CheckChannelReorder(NULL, chans_out, mask, tab);
 }
 
 /**

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

[vlc-commits] ALSA: only set channels that are actually mapped (fixes #8934)

2013-07-10 Thread Rémi Denis-Courmont 
vlc/vlc-2.1 | branch: master | Rémi Denis-Courmont  | Wed Jul 
10 23:24:47 2013 +0300| [86638e9266556945f8d999ab7e0cace9ab77d2e1] | committer: 
Rémi Denis-Courmont

ALSA: only set channels that are actually mapped (fixes #8934)

The code failed to clear unmapped channels present in the input.

(cherry picked from commit d3a43ec88f34eca9c59151c076bb7226a9db5d8c)

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

 modules/audio_output/alsa.c |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 350d509..9a231aa 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -207,19 +207,21 @@ static int Map2Mask (vlc_object_t *obj, const 
snd_pcm_chmap_t *restrict map)
  * Compares a fixed ALSA channels map with the VLC channels order.
  */
 static unsigned SetupChannelsFixed(const snd_pcm_chmap_t *restrict map,
-uint16_t *restrict mask, uint8_t *restrict tab)
+   uint16_t *restrict maskp, uint8_t *restrict tab)
 {
 uint32_t chans_out[AOUT_CHAN_MAX];
+uint16_t mask = 0;
 
 for (unsigned i = 0; i < map->channels; i++)
 {
 uint_fast16_t vlc_chan = vlc_chans[map->pos[i]];
 
 chans_out[i] = vlc_chan;
-*mask |= vlc_chan;
+mask |= vlc_chan;
 }
 
-return aout_CheckChannelReorder(NULL, chans_out, *mask, tab);
+*maskp = mask;
+return aout_CheckChannelReorder(NULL, chans_out, mask, tab);
 }
 
 /**

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

[vlc-commits] avcodec: allow codec NONE in the table (refs #8887)

2013-07-10 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Wed Jul 10 
19:52:36 2013 +0300| [a2896580ab0db45158589458441b8fbe271d1eeb] | committer: 
Rémi Denis-Courmont

avcodec: allow codec NONE in the table (refs #8887)

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

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

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index f6a891d..b33e391 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -445,15 +445,16 @@ static const struct
 { VLC_CODEC_XSUB, AV_CODEC_ID_XSUB, SPU_ES },
 { VLC_CODEC_SSA, AV_CODEC_ID_SSA, SPU_ES },
 { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT, SPU_ES },
-
-{ 0, 0, UNKNOWN_ES }
 };
 
+static const size_t codecs_count = sizeof (codecs_table)
+ / sizeof (codecs_table[0]);
+
 int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
 int *pi_ffmpeg_codec, const char **ppsz_name )
 {
 i_fourcc = vlc_fourcc_GetCodec( UNKNOWN_ES, i_fourcc );
-for( unsigned i = 0; codecs_table[i].i_fourcc != 0; i++ )
+for( unsigned i = 0; i < codecs_count; i++ )
 {
 if( codecs_table[i].i_fourcc == i_fourcc )
 {
@@ -470,7 +471,7 @@ int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
 int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
   vlc_fourcc_t *pi_fourcc, const char **ppsz_name )
 {
-for( unsigned i = 0; codecs_table[i].i_codec != 0; i++ )
+for( unsigned i = 0; i < codecs_count; i++ )
 {
 if( codecs_table[i].i_codec == i_ffmpeg_codec )
 {

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

[vlc-commits] avformat: add codec ID in debug info

2013-07-10 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Wed Jul 10 
19:37:09 2013 +0300| [843839129dc95b170e3f95a0d63edea4873d66be] | committer: 
Rémi Denis-Courmont

avformat: add codec ID in debug info

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

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

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index d2e17cf..016c5be 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -495,8 +495,8 @@ int OpenDemux( vlc_object_t *p_this )
 es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
 es_format_Clean( &fmt );
 
-msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
- psz_type, (char*)&fcc );
+msg_Dbg( p_demux, "adding es: %s codec = %4.4s (%d)",
+ psz_type, (char*)&fcc, cc->codec_id  );
 TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
 }
 }

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

[vlc-commits] l10n: French update

2013-07-10 Thread Eric Lassauge 
vlc/vlc-2.1 | branch: master | Eric Lassauge  | Wed Jul 
10 18:05:59 2013 +0200| [9acc92b1f877e692700e79556ffbc0001e3fe01a] | committer: 
Rafaël Carré

l10n: French update

Signed-off-by: Christoph Miebach 

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

 po/fr.po | 5146 ++
 1 file changed, 2503 insertions(+), 2643 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=9acc92b1f877e692700e79556ffbc0001e3fe01a
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: remove dead code

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 17:07:57 
2013 +0200| [27ae51dd4674bdb17110a734ba34327ef21098bd] | committer: Ludovic 
Fauvet

Qt: remove dead code

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

 modules/gui/qt4/components/extended_panels.cpp |   47 +---
 modules/gui/qt4/components/extended_panels.hpp |1 -
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp 
b/modules/gui/qt4/components/extended_panels.cpp
index 103ac7b..74fc7b3 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -1,7 +1,7 @@
 /*
  * extended_panels.cpp : Extended controls panels
  
- * Copyright (C) 2006-2012 the VideoLAN team
+ * Copyright (C) 2006-2013 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac 
@@ -61,29 +61,6 @@ static char *ChangeFiltersString( struct intf_thread_t 
*p_intf, const char *psz_
 static void ChangeAFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );
 static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );
 
-#if 0
-class ConfClickHandler : public QObject
-{
-public:
-ConfClickHandler( intf_thread_t *_p_intf, ExtVideo *_e ) : QObject ( _e ) {
-e = _e; p_intf = _p_intf;
-}
-virtual ~ConfClickHandler() {}
-bool eventFilter( QObject *obj, QEvent *evt )
-{
-if( evt->type() == QEvent::MouseButtonPress )
-{
-e->gotoConf( obj );
-return true;
-}
-return false;
-}
-private:
-ExtVideo* e;
-intf_thread_t *p_intf;
-};
-#endif
-
 const QString ModuleFromWidgetName( QObject *obj )
 {
 return obj->objectName().replace( "Enable","" );
@@ -708,28 +685,6 @@ void ExtVideo::updateFilterOptions()
 if( p_obj ) vlc_object_release( p_obj );
 }
 
-#if 0
-void ExtVideo::gotoConf( QObject* src )
-{
-#define SHOWCONF( module ) \
-if( src->objectName().contains( module ) ) \
-{ \
-PrefsDialog::getInstance( p_intf )->showModulePrefs( module ); \
-return; \
-}
-SHOWCONF( "clone" );
-SHOWCONF( "magnify" );
-SHOWCONF( "wave" );
-SHOWCONF( "ripple" );
-SHOWCONF( "invert" );
-SHOWCONF( "puzzle" );
-SHOWCONF( "wall" );
-SHOWCONF( "gradient" );
-SHOWCONF( "colorthres" );
-SHOWCONF( "anaglyph" )
-}
-#endif
-
 /**
  * v4l2 controls
  **/
diff --git a/modules/gui/qt4/components/extended_panels.hpp 
b/modules/gui/qt4/components/extended_panels.hpp
index e43e743..770f558 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -46,7 +46,6 @@ class ExtVideo: public QObject
 friend class ExtendedDialog;
 public:
 ExtVideo( struct intf_thread_t *, QTabWidget * );
-/*void gotoConf( QObject* );*/
 private:
 Ui::ExtVideoWidget ui;
 QSignalMapper* filterMapper;

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

[vlc-commits] Qt: useless #includes

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 17:10:23 
2013 +0200| [da653b5f54e5d5aed3fa4e3b332cac55334fee58] | committer: Ludovic 
Fauvet

Qt: useless #includes

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

 modules/gui/qt4/components/extended_panels.cpp |3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp 
b/modules/gui/qt4/components/extended_panels.cpp
index 74fc7b3..532e811 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -50,13 +50,10 @@
 #include "util/customwidgets.hpp"
 
 #include "../../audio_filter/equalizer_presets.h"
-#include 
 #include 
 #include 
 #include 
 
-#include  /* us_strtod */
-
 static char *ChangeFiltersString( struct intf_thread_t *p_intf, const char 
*psz_filter_type, const char *psz_name, bool b_add );
 static void ChangeAFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );
 static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );

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

[vlc-commits] Qt: unused parameter

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 18:13:02 
2013 +0200| [3f531eb49156b974f9bc1164a1c662d42d728932] | committer: Ludovic 
Fauvet

Qt: unused parameter

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

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

diff --git a/modules/gui/qt4/input_manager.cpp 
b/modules/gui/qt4/input_manager.cpp
index aa87c80..bd32de6 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1187,6 +1187,7 @@ static int PLItemChanged( vlc_object_t *p_this, const 
char *psz_var,
 vlc_value_t oldval, vlc_value_t val, void *param )
 {
 VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
+VLC_UNUSED( val );
 
 MainInputManager *mim = (MainInputManager*)param;
 

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

[vlc-commits] Qt: fix .ui names conflicts and warnings

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 18:06:42 
2013 +0200| [a028907e13d6017b47d665ba4d1c35cec837caca] | committer: Ludovic 
Fauvet

Qt: fix .ui names conflicts and warnings

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

 modules/gui/qt4/ui/open.ui  |2 +-
 modules/gui/qt4/ui/sprefs_audio.ui  |2 +-
 modules/gui/qt4/ui/sprefs_video.ui  |2 +-
 modules/gui/qt4/ui/video_effects.ui |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/ui/open.ui b/modules/gui/qt4/ui/open.ui
index e5b8490..ea510db 100644
--- a/modules/gui/qt4/ui/open.ui
+++ b/modules/gui/qt4/ui/open.ui
@@ -220,7 +220,7 @@

   
   
-   
+   
   
   

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui 
b/modules/gui/qt4/ui/sprefs_audio.ui
index 93b2ac7..367e74c 100644
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -450,7 +450,7 @@

 true

-   
+   
 
  0
 
diff --git a/modules/gui/qt4/ui/sprefs_video.ui 
b/modules/gui/qt4/ui/sprefs_video.ui
index 8ce49ba..1f588a5 100644
--- a/modules/gui/qt4/ui/sprefs_video.ui
+++ b/modules/gui/qt4/ui/sprefs_video.ui
@@ -166,7 +166,7 @@
 
  Video
 
-
+
  
   

diff --git a/modules/gui/qt4/ui/video_effects.ui 
b/modules/gui/qt4/ui/video_effects.ui
index be07ad3..e6ad2b3 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -956,7 +956,7 @@
   
false
   
-  
+  

 
  

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

[vlc-commits] l10n: Ukrainian update

2013-07-10 Thread Andriy Bandura 
vlc/vlc-2.1 | branch: master | Andriy Bandura  | 
Wed Jul 10 16:59:16 2013 +0200| [b689ed624f9c1fa9ad32301c9f72667af04883b7] | 
committer: Christoph Miebach

l10n: Ukrainian update

Signed-off-by: Christoph Miebach 

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

 po/uk.po | 1099 +++---
 1 file changed, 552 insertions(+), 547 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=b689ed624f9c1fa9ad32301c9f72667af04883b7
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Danish update

2013-07-10 Thread Aputsiaĸ Niels Janussen 
vlc/vlc-2.1 | branch: master | Aputsiaĸ Niels Janussen  | Wed Jul 
10 16:17:11 2013 +0200| [ac43beb89af163065d902e0e12c0258c265d] | committer: 
Christoph Miebach

l10n: Danish update

Signed-off-by: Christoph Miebach 

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

 po/da.po |  916 --
 1 file changed, 476 insertions(+), 440 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=ac43beb89af163065d902e0e12c0258c265d
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Bosnian update

2013-07-10 Thread Adnan Memija 
vlc/vlc-2.1 | branch: master | Adnan Memija  | Wed Jul 10 
16:10:52 2013 +0200| [199de506c0219deee786ff5c70908efd87c6f447] | committer: 
Christoph Miebach

l10n: Bosnian update

Signed-off-by: Christoph Miebach 

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

 po/bs.po |   70 +++---
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/po/bs.po b/po/bs.po
index fe404a0..45bce67 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: VLC - Trans\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2013-06-06 17:40+0200\n"
-"PO-Revision-Date: 2013-06-19 22:36+\n"
+"PO-Revision-Date: 2013-07-10 09:48+\n"
 "Last-Translator: Adnan Memija \n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/vlc-trans/";
 "language/bs/)\n"
@@ -4402,11 +4402,11 @@ msgstr ""
 
 #: src/libvlc-module.c:2641
 msgid "reset the current config to the default values"
-msgstr ""
+msgstr "resetuj trenutnu konfiguraciju na zadane vrijednosti"
 
 #: src/libvlc-module.c:2643
 msgid "use alternate config file"
-msgstr ""
+msgstr "koristi alternativnu konfiguracijsku datoteku"
 
 #: src/libvlc-module.c:2645
 msgid "resets the current plugins cache"
@@ -4414,7 +4414,7 @@ msgstr ""
 
 #: src/libvlc-module.c:2647
 msgid "print version information"
-msgstr ""
+msgstr "printaj informacije o verziji"
 
 #: src/libvlc-module.c:2685
 msgid "main program"
@@ -5526,7 +5526,7 @@ msgstr "S-video"
 
 #: modules/access/decklink.cpp:89 modules/video_output/decklink.cpp:120
 msgid "Embedded"
-msgstr ""
+msgstr "Prošireno"
 
 #: modules/access/decklink.cpp:89 modules/video_output/decklink.cpp:120
 msgid "AES/EBU"
@@ -5579,7 +5579,7 @@ msgstr "DSS"
 #: modules/access/dshow/dshow.cpp:130
 #: modules/gui/qt4/components/open_panels.cpp:817
 msgid "Video device name"
-msgstr ""
+msgstr "Naziv video uređaja"
 
 #: modules/access/dshow/dshow.cpp:132
 msgid ""
@@ -5641,7 +5641,7 @@ msgstr ""
 
 #: modules/access/dshow/dshow.cpp:155
 msgid "Device properties"
-msgstr ""
+msgstr "Podešavanja uređaja"
 
 #: modules/access/dshow/dshow.cpp:157
 msgid ""
@@ -5650,7 +5650,7 @@ msgstr ""
 
 #: modules/access/dshow/dshow.cpp:159
 msgid "Tuner properties"
-msgstr ""
+msgstr "Podešavanja tunera"
 
 #: modules/access/dshow/dshow.cpp:161
 msgid "Show the tuner properties [channel selection] page."
@@ -5666,7 +5666,7 @@ msgstr ""
 
 #: modules/access/dshow/dshow.cpp:166
 msgid "Tuner Frequency"
-msgstr ""
+msgstr "Frekvencija Tunera"
 
 #: modules/access/dshow/dshow.cpp:167
 msgid "This overrides the channel. Measured in Hz."
@@ -5676,7 +5676,7 @@ msgstr ""
 #: modules/gui/qt4/components/open_panels.cpp:845
 #: modules/gui/qt4/components/open_panels.cpp:1066
 msgid "Video standard"
-msgstr ""
+msgstr "Video standard"
 
 #: modules/access/dshow/dshow.cpp:169
 msgid "Tuner country code"
@@ -5784,7 +5784,7 @@ msgstr "Neuspješno hvatanje"
 
 #: modules/access/dshow/dshow.cpp:528
 msgid "No video or audio device selected."
-msgstr ""
+msgstr "Nisu odabrani ni jedan uređaj zvuka ili videa."
 
 #: modules/access/dshow/dshow.cpp:602
 msgid "VLC cannot open ANY capture device. Check the error log for details."
@@ -5902,7 +5902,7 @@ msgstr ""
 
 #: modules/access/dtv/access.c:94
 msgid "FEC code rate"
-msgstr ""
+msgstr "FEC kod rata"
 
 #: modules/access/dtv/access.c:95
 msgid "High-priority code rate"
@@ -5914,15 +5914,15 @@ msgstr ""
 
 #: modules/access/dtv/access.c:97
 msgid "Layer A code rate"
-msgstr ""
+msgstr "Sloj A kod rata"
 
 #: modules/access/dtv/access.c:98
 msgid "Layer B code rate"
-msgstr ""
+msgstr "Sloj B kod rata"
 
 #: modules/access/dtv/access.c:99
 msgid "Layer C code rate"
-msgstr ""
+msgstr "Sloj C kod rata"
 
 #: modules/access/dtv/access.c:101
 msgid "The code rate for Forward Error Correction can be specified."
@@ -6099,7 +6099,7 @@ msgstr ""
 
 #: modules/access/dtv/access.c:197
 msgid "DiSEqC LNB number"
-msgstr ""
+msgstr "DiSEqC LNB broj"
 
 #: modules/access/dtv/access.c:199
 msgid ""
@@ -6459,7 +6459,7 @@ msgstr ""
 
 #: modules/access/http.c:64 modules/access/mms/mms.c:58
 msgid "HTTP proxy"
-msgstr ""
+msgstr "HTTP poslužitelj"
 
 #: modules/access/http.c:66
 msgid ""
@@ -6469,7 +6469,7 @@ msgstr ""
 
 #: modules/access/http.c:70
 msgid "HTTP proxy password"
-msgstr ""
+msgstr "HTTP šifra poslužitelja"
 
 #: modules/access/http.c:72
 msgid "If your HTTP proxy requires a password, set it here."
@@ -6513,7 +6513,7 @@ msgstr ""
 
 #: modules/access/http.c:91
 msgid "User Agent"
-msgstr ""
+msgstr "Korisnički Agent"
 
 #: modules/access/http.c:92
 msgid ""
@@ -6713,7 +6713,7 @@ msgstr ""
 #: modules/access/linsys/linsys_hdsdi.c:72
 #: modules/access/linsys/linsys_sdi.c:67
 msgid "Link #"
-msgstr ""
+msgstr "Link #"
 
 #: modules/access/linsys/linsys_hdsdi.c:74
 #: modules/access/linsys/linsys_sdi.c:69
@@ -6813,7 +6813,7 @@ msgstr ""
 
 #: modules/access/live555

[vlc-commits] l10n: Thai update

2013-07-10 Thread Thanakrit Chomphuming 
vlc/vlc-2.1 | branch: master | Thanakrit Chomphuming  | Wed 
Jul 10 16:52:48 2013 +0200| [275c61ac1a70160466d01435e8461ed4920be561] | 
committer: Christoph Miebach

l10n: Thai update

Signed-off-by: Christoph Miebach 

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

 po/th.po | 2593 +++---
 1 file changed, 1450 insertions(+), 1143 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=275c61ac1a70160466d01435e8461ed4920be561
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Italian update

2013-07-10 Thread VideoLAN 
vlc/vlc-2.1 | branch: master | VideoLAN  | Wed Jul 10 
16:36:03 2013 +0200| [960d08d3bc10c26e47e8b4cdfbce9f6548977fc6] | committer: 
Christoph Miebach

l10n: Italian update

Signed-off-by: Christoph Miebach 

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

 po/it.po | 7405 +-
 1 file changed, 4456 insertions(+), 2949 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=960d08d3bc10c26e47e8b4cdfbce9f6548977fc6
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Japanese update

2013-07-10 Thread Fumio Nakayama 
vlc/vlc-2.1 | branch: master | Fumio Nakayama  | Wed Jul 
10 16:37:51 2013 +0200| [bb2df475217b2303d3692d2af5a8667c8aa43e2f] | committer: 
Christoph Miebach

l10n: Japanese update

Signed-off-by: Christoph Miebach 

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

 po/ja.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 8191a81..5292af9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: VLC - Trans\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2013-06-06 17:40+0200\n"
-"PO-Revision-Date: 2013-06-09 14:24+\n"
+"PO-Revision-Date: 2013-06-24 12:47+\n"
 "Last-Translator: Fumio Nakayama \n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/vlc-trans/";
 "language/ja/)\n"
@@ -10538,7 +10538,7 @@ msgid ""
 "Skipping the loop filter (aka deblocking) usually has a detrimental effect "
 "on quality. However it provides a big speedup for high definition streams."
 msgstr ""
-"ループフィルター(ブロック化解除など)を外すことは、品質面からは一般的に好まし"
+"ループフィルター(ブロック化抑止など)を外すことは、品質面からは一般的に好まし"
 "くありませんが、高密度のストリームでは大きなスピードの改善をもたらします。"
 
 #: modules/codec/avcodec/avcodec.h:136
@@ -12727,7 +12727,7 @@ msgstr "ループフィルターをスキップ"
 
 #: modules/codec/x264.c:141
 msgid "Deactivate the deblocking loop filter (decreases quality)."
-msgstr "非ブロッキングループフィルターを無効化します。(品質を低下させます)"
+msgstr "ブロック化抑止ループフィルターを無効化します。(品質を低下させます)"
 
 #: modules/codec/x264.c:143
 msgid "Loop filter AlphaC0 and Beta parameters alpha:beta"
@@ -28496,7 +28496,7 @@ msgstr "ハードウェアアクセラレーションによるデコード"
 
 #: modules/gui/qt4/ui/sprefs_input.h:346
 msgid "Skip H.264 in-loop deblocking filter"
-msgstr "H.264インループブロック化解除フィルターをスキップ"
+msgstr "H.264インループブロック化抑止フィルターをスキップ"
 
 #: modules/gui/qt4/ui/sprefs_input.h:347
 msgid "Video quality post-processing level"

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

[vlc-commits] l10n: Welsh update

2013-07-10 Thread Aled Powell 
vlc/vlc-2.1 | branch: master | Aled Powell  | Wed Jul 10 
16:15:18 2013 +0200| [0dbf4fb4fc54121ea12922b2b5e1d3d4cf24b2b2] | committer: 
Christoph Miebach

l10n: Welsh update

Signed-off-by: Christoph Miebach 

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

 po/cy.po | 1360 ++
 1 file changed, 749 insertions(+), 611 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=0dbf4fb4fc54121ea12922b2b5e1d3d4cf24b2b2
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: French update

2013-07-10 Thread Eric Lassauge 
vlc/vlc-2.1 | branch: master | Eric Lassauge  | Wed Jul 
10 18:05:59 2013 +0200| [55d6086df75e2426db6a276cafdb7f933d28cdb9] | committer: 
Christoph Miebach

l10n: French update

Signed-off-by: Christoph Miebach 

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

 po/fr.po | 5202 ++
 1 file changed, 2530 insertions(+), 2672 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=55d6086df75e2426db6a276cafdb7f933d28cdb9
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Spanish update

2013-07-10 Thread David González 
vlc/vlc-2.1 | branch: master | David González  | Wed Jul 10 
16:26:46 2013 +0200| [2777edb5aad8d8d5017e5357b8a8838ec75f123c] | committer: 
Christoph Miebach

l10n: Spanish update

Signed-off-by: Christoph Miebach 

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

 po/es.po |  404 ++
 1 file changed, 251 insertions(+), 153 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=2777edb5aad8d8d5017e5357b8a8838ec75f123c
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Lithuanian update

2013-07-10 Thread Mindaugas Baranauskas 
vlc/vlc-2.1 | branch: master | Mindaugas Baranauskas  | Wed Jul 
10 16:40:33 2013 +0200| [066ff37e8cc2afc7078096268774a0bcea750ed9] | committer: 
Christoph Miebach

l10n: Lithuanian update

Signed-off-by: Christoph Miebach 

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

 po/lt.po | 5394 +++---
 1 file changed, 3029 insertions(+), 2365 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=066ff37e8cc2afc7078096268774a0bcea750ed9
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Vietnamese update

2013-07-10 Thread VideoLAN 
vlc/vlc-2.1 | branch: master | VideoLAN  | Wed Jul 10 
17:05:45 2013 +0200| [cebd9ff8efae7eed239f5c68b4800212804f49cc] | committer: 
Christoph Miebach

l10n: Vietnamese update

Signed-off-by: Christoph Miebach 

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

 po/vi.po |12416 --
 1 file changed, 6390 insertions(+), 6026 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=cebd9ff8efae7eed239f5c68b4800212804f49cc
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Hindi update

2013-07-10 Thread Shantanu Sarkar 
vlc/vlc-2.1 | branch: master | Shantanu Sarkar  | 
Wed Jul 10 16:32:02 2013 +0200| [212f8e51e94dc236d62a10d1af2d118ec3acf2f2] | 
committer: Christoph Miebach

l10n: Hindi update

Signed-off-by: Christoph Miebach 

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

 po/hi.po | 1340 --
 1 file changed, 699 insertions(+), 641 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=212f8e51e94dc236d62a10d1af2d118ec3acf2f2
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Turkish update

2013-07-10 Thread VideoLAN 
vlc/vlc-2.1 | branch: master | VideoLAN  | Wed Jul 10 
16:56:16 2013 +0200| [db728f298b284baf8d168e3fcbe277e17e5c167a] | committer: 
Christoph Miebach

l10n: Turkish update

Signed-off-by: Christoph Miebach 

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

 po/tr.po |   23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index d9b81b2..80fd9b4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,6 +8,7 @@
 # canberkol , 2013
 # Caner BAŞARAN , 2013
 # Kaya Zeren , 2012-2013
+# MehmetE , 2013
 # Ufuk Uyumaz , 2013
 # Yaşar TAY , 2009
 msgid ""
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: VLC - Trans\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2013-06-06 17:40+0200\n"
-"PO-Revision-Date: 2013-06-08 14:16+\n"
-"Last-Translator: Kaya Zeren \n"
+"PO-Revision-Date: 2013-07-07 16:40+\n"
+"Last-Translator: MehmetE \n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/vlc-trans/";
 "language/tr/)\n"
 "Language: tr\n"
@@ -10031,7 +10032,7 @@ msgstr ""
 
 #: modules/audio_filter/stereo_widen.c:66
 msgid "Crossfeed"
-msgstr ""
+msgstr "çapraz besleme"
 
 #: modules/audio_filter/stereo_widen.c:67
 msgid ""
@@ -10153,7 +10154,7 @@ msgstr ""
 
 #: modules/audio_output/auhal.c:69
 msgid "Last audio device"
-msgstr ""
+msgstr "Son ses cihazı"
 
 #: modules/audio_output/auhal.c:161
 msgid "HAL AudioUnit output"
@@ -10177,7 +10178,7 @@ msgstr ""
 
 #: modules/audio_output/auhal.c:1100
 msgid "System Sound Output Device"
-msgstr ""
+msgstr "Sistem ses çıkış cihazı"
 
 #: modules/audio_output/auhal.c:1175
 #, c-format
@@ -10884,7 +10885,7 @@ msgstr ""
 
 #: modules/codec/avcodec/dxva2.c:58
 msgid "DirectX Video Acceleration (DXVA) 2.0"
-msgstr ""
+msgstr "DirectX Video Hızlandırma (DXVA) 2.0"
 
 #: modules/codec/avcodec/encoder.c:249
 #, c-format
@@ -10921,7 +10922,7 @@ msgstr "VLC kodlayıcıyı açamadı."
 
 #: modules/codec/avcodec/vaapi.c:48
 msgid "Video Acceleration (VA) API"
-msgstr ""
+msgstr "Video Hızlandırma (VA) API"
 
 #: modules/codec/avcodec/vda.c:47
 msgid "420YpCbCr8Planar"
@@ -13450,11 +13451,11 @@ msgstr ""
 
 #: modules/codec/x264.c:412
 msgid "x264 advanced options."
-msgstr ""
+msgstr "x264 gelişmiş seçenekler."
 
 #: modules/codec/x264.c:413
 msgid "x264 advanced options, in the form {opt=val,op2=val2} ."
-msgstr ""
+msgstr "x264 gelişmiş seçenekler, in the form {opt=val,op2=val2} ."
 
 #: modules/codec/x264.c:418
 msgid "dia"
@@ -13519,7 +13520,7 @@ msgstr "yan yana"
 
 #: modules/codec/x264.c:439
 msgid "top bottom"
-msgstr ""
+msgstr "üst alt"
 
 #: modules/codec/x264.c:439
 msgid "frame alternation"
@@ -14424,7 +14425,7 @@ msgstr "Asla onarma"
 
 #: modules/demux/avi/avi.c:68
 msgid "Fix when necessary"
-msgstr ""
+msgstr "Gerektiğinde düzelt"
 
 #: modules/demux/avi/avi.c:72
 msgid "AVI demuxer"

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

[vlc-commits] l10n: German update

2013-07-10 Thread VideoLAN 
vlc/vlc-2.1 | branch: master | VideoLAN  | Wed Jul 10 
16:20:56 2013 +0200| [2de1cd427ba70d49ef085cadfd5340cbbd9313e5] | committer: 
Christoph Miebach

l10n: German update

Signed-off-by: Christoph Miebach 

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

 po/de.po | 1527 ++
 1 file changed, 851 insertions(+), 676 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=2de1cd427ba70d49ef085cadfd5340cbbd9313e5
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Catalan update

2013-07-10 Thread Pau Iranzo 
vlc/vlc-2.1 | branch: master | Pau Iranzo  | Wed Jul 10 
16:13:38 2013 +0200| [ca6e95e85febadc95f31c19bfac4012ec517b2a6] | committer: 
Christoph Miebach

l10n: Catalan update

Signed-off-by: Christoph Miebach 

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

 po/ca.po |20180 +++---
 1 file changed, 11283 insertions(+), 8897 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=ca6e95e85febadc95f31c19bfac4012ec517b2a6
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] l10n: Icelandic update

2013-07-10 Thread Sveinn í Felli 
vlc/vlc-2.1 | branch: master | Sveinn í Felli  | Wed Jul 10 
16:32:48 2013 +0200| [93155c9b915bbeb54b8bb8384626d8708b24] | committer: 
Christoph Miebach

l10n: Icelandic update

Signed-off-by: Christoph Miebach 

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

 po/is.po |  334 --
 1 file changed, 171 insertions(+), 163 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=93155c9b915bbeb54b8bb8384626d8708b24
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: do not extend the dialog minimum width for long lines

2013-07-10 Thread Ludovic Fauvet 
vlc/vlc-2.1 | branch: master | Ludovic Fauvet  | Wed Jul 10 
14:40:03 2013 +0200| [057ab16af751e3062d59d9fc0a15b505ab6c1f72] | committer: 
Jean-Baptiste Kempf

Qt: do not extend the dialog minimum width for long lines

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

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

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

diff --git a/modules/gui/qt4/components/extended_panels.cpp 
b/modules/gui/qt4/components/extended_panels.cpp
index 7c87b9c..3b32011 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -709,6 +709,7 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
   "Controls will automatically appear here.")
   , this );
 help->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+help->setWordWrap( true );
 layout->addWidget( help );
 setLayout( layout );
 }

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

[vlc-commits] OpenGL: take planes in account in DrawWithShaders

2013-07-10 Thread Nicolas Bertrand 
vlc/vlc-2.1 | branch: master | Nicolas Bertrand  | Tue 
Jul  9 15:59:24 2013 +0200| [ed417195be0ca4e8c90f809dc8cb89fe27fbcbaf] | 
committer: Jean-Baptiste Kempf

OpenGL: take planes in account in DrawWithShaders

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

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

 modules/video_output/opengl.c |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 735c591..a0d915d 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -923,10 +923,15 @@ static void DrawWithShaders(vout_display_opengl_t *vgl,
 {
 vgl->UseProgram(vgl->program[program]);
 if (program == 0) {
-vgl->Uniform4fv(vgl->GetUniformLocation(vgl->program[0], 
"Coefficient"), 4, vgl->local_value);
-vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture0"), 
0);
-vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture1"), 
1);
-vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture2"), 
2);
+if (vgl->chroma->plane_count == 3) {
+vgl->Uniform4fv(vgl->GetUniformLocation(vgl->program[0], 
"Coefficient"), 4, vgl->local_value);
+vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], 
"Texture0"), 0);
+vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], 
"Texture1"), 1);
+vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], 
"Texture2"), 2);
+}
+else if (vgl->chroma->plane_count == 1) {
+vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], 
"Texture0"), 0);
+}
 } else {
 vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[1], "Texture0"), 
0);
 vgl->Uniform4f(vgl->GetUniformLocation(vgl->program[1], "FillColor"), 
1.0f, 1.0f, 1.0f, 1.0f);
@@ -1000,7 +1005,7 @@ int vout_display_opengl_Display(vout_display_opengl_t 
*vgl,
 }
 
 #ifdef SUPPORTS_SHADERS
-if (vgl->program[0] && vgl->chroma->plane_count == 3)
+if (vgl->program[0] && (vgl->chroma->plane_count == 3 || 
vgl->chroma->plane_count == 1))
 DrawWithShaders(vgl, left, top, right, bottom, 0);
 else if (vgl->program[1] && vgl->chroma->plane_count == 1)
 DrawWithShaders(vgl, left, top, right, bottom, 1);

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

[vlc-commits] Qt: get/set the default volume level for each audio output (fix #8503)

2013-07-10 Thread Ludovic Fauvet 
vlc/vlc-2.1 | branch: master | Ludovic Fauvet  | Tue Jul  9 
00:17:28 2013 +0200| [457a26b34b227cfb65987405b6c74b48b3774422] | committer: 
Jean-Baptiste Kempf

Qt: get/set the default volume level for each audio output (fix #8503)

Since 2.1 there is no way to set a global default volume. Instead it is now
required to set it independently for each audio output.

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

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

 modules/gui/qt4/components/simple_preferences.cpp |   93 +++--
 modules/gui/qt4/ui/sprefs_audio.ui|   55 +---
 2 files changed, 104 insertions(+), 44 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp 
b/modules/gui/qt4/components/simple_preferences.cpp
index 5c2dc60..9b08b18 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define ICON_HEIGHT 64
 
@@ -326,16 +327,50 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget 
*_parent,
 #undef audioControl
 #undef audioCommon
 
+int i_max_volume = config_GetInt( p_intf, "qt-max-volume" );
+
 /* Audio Options */
-ui.volumeValue->setMaximum( 200 );
-CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
- defaultVolume );
+ui.volumeValue->setMaximum( i_max_volume );
+ui.defaultVolume->setMaximum( i_max_volume );
+
+bool b_enabled = config_GetInt( p_intf, "volume-save" );
+ui.resetVolumeCheckbox->setChecked( !b_enabled );
+
+p_config = config_FindConfig( VLC_OBJECT(p_intf), "aout" );
+char *psz_aout = p_config->value.psz;
+
+int i_volume = 100; //FIXME not foolproof
+
+#define get_vol_aout( name ) \
+module_exists( name ) && ( !strcmp( psz_aout, name ) || !strcmp( 
psz_aout, "any" ) )
+
+#if defined( _WIN32 )
+if( get_vol_aout( "directx" ) )
+i_volume = config_GetFloat( p_intf, "directx-volume") * 100 + 
0.5;
+else if( get_vol_aout( "waveout" ) )
+i_volume = config_GetFloat( p_intf, "waveout-volume") * 100 + 
0.5;
+#elif defined( Q_WS_MAC )
+if( get_vol_aout( "auhal" ) )
+i_volume = ( config_GetFloat( p_intf, "auhal-volume") * 100 + 
0.5 )
+/ AOUT_VOLUME_DEFAULT;
+#elif defined( __OS2__ )
+if( get_vol_aout( "kai" ) )
+i_volume = cbrtf( config_GetFloat( p_intf, "kai-gain" ) ) * 
100 + 0.5;
+#else
+if( get_vol_aout( "alsa" ) )
+i_volume = cbrtf( config_GetFloat( p_intf, "alsa-gain" ) ) * 
100 + 0.5;
+else if( get_vol_aout( "jack" ) )
+i_volume = cbrtf( config_GetFloat( p_intf, "jack-gain" ) ) * 
100 + 0.5;
+#endif
+#undef get_vol_aout
+
+ui.defaultVolume->setValue( i_volume );
+
 CONNECT( ui.defaultVolume, valueChanged( int ),
  this, updateAudioVolume( int ) );
 
-CONFIG_BOOL( "volume-save", keepVolumeRadio );
-ui.defaultVolume_zone->setEnabled( 
ui.resetVolumeRadio->isChecked() );
-CONNECT( ui.resetVolumeRadio, toggled( bool ),
+ui.defaultVolume_zone->setEnabled( 
ui.resetVolumeCheckbox->isChecked() );
+CONNECT( ui.resetVolumeCheckbox, toggled( bool ),
  ui.defaultVolume_zone, setEnabled( bool ) );
 
 CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
@@ -371,6 +406,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget 
*_parent,
 optionWidgets["volLW"] = ui.volumeValue;
 optionWidgets["headphoneB"] = ui.headphoneEffect;
 optionWidgets["spdifChB"] = ui.spdifBox;
+optionWidgets["defaultVolume"] = ui.defaultVolume;
+optionWidgets["resetVolumeCheckbox"] = ui.resetVolumeCheckbox;
 updateAudioOptions( ui.outputModule->currentIndex() );
 
 /* LastFM */
@@ -407,7 +444,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget 
*_parent,
 qs_filter = qfu( psz ).split( ':', QString::SkipEmptyParts );
 free( psz );
 
-bool b_enabled = ( qs_filter.contains( "normvol" ) );
+b_enabled = ( qs_filter.contains( "normvol" ) );
 ui.volNormBox->setChecked( b_enabled );
 ui.volNormSpin->setEnabled( b_enabled );
 
@@ -782,7 +819,7 @@ SPrefsPanel::~SPrefsPanel()
 void SPrefsPanel::updateAudioVolume( int volume )
 {
 qobject_cast(optionWidgets["volLW"])
-->setValue( volume * 100 / AOUT_VOLUME_DEFAULT );
+->setValue( volume );
 }
 
 
@@ -859,6 +896,46 @@ void SPrefsPanel::apply()
 qs_filter.removeAll( "headp

[vlc-commits] Qt: move the video filter parser in its own function

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 16:00:25 
2013 +0200| [d3953b96109c0ba62a554b7ebddf989dcfc01be8] | committer: Ludovic 
Fauvet

Qt: move the video filter parser in its own function

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

 modules/gui/qt4/components/extended_panels.cpp |   80 ++--
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp 
b/modules/gui/qt4/components/extended_panels.cpp
index acc9215..57c35e4 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -57,6 +57,7 @@
 
 #include  /* us_strtod */
 
+static char *ChangeFiltersString( struct intf_thread_t *p_intf, const char 
*psz_filter_type, const char *psz_name, bool b_add );
 static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );
 
 #if 0
@@ -293,39 +294,9 @@ void ExtVideo::clean()
 ui.cropRightPx->setValue( 0 );
 }
 
-static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add )
+static char *ChangeFiltersString( struct intf_thread_t *p_intf, const char 
*psz_filter_type, const char *psz_name, bool b_add )
 {
 char *psz_parser, *psz_string;
-const char *psz_filter_type;
-
-module_t *p_obj = module_find( psz_name );
-if( !p_obj )
-{
-msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
-return;
-}
-
-if( module_provides( p_obj, "video splitter" ) )
-{
-psz_filter_type = "video-splitter";
-}
-else if( module_provides( p_obj, "video filter2" ) )
-{
-psz_filter_type = "video-filter";
-}
-else if( module_provides( p_obj, "sub source" ) )
-{
-psz_filter_type = "sub-source";
-}
-else if( module_provides( p_obj, "sub filter" ) )
-{
-psz_filter_type = "sub-filter";
-}
-else
-{
-msg_Err( p_intf, "Unknown video filter type." );
-return;
-}
 
 psz_string = config_GetPsz( p_intf, psz_filter_type );
 
@@ -342,14 +313,14 @@ static void ChangeVFiltersString( struct intf_thread_t 
*p_intf, const char *psz_
 psz_string, psz_name ) == -1 )
 {
 free( psz_parser );
-return;
+return NULL;
 }
 free( psz_parser );
 }
 else
 {
 free( psz_string );
-return;
+return NULL;
 }
 }
 else
@@ -376,9 +347,50 @@ static void ChangeVFiltersString( struct intf_thread_t 
*p_intf, const char *psz_
 else
 {
 free( psz_string );
-return;
+return NULL;
 }
 }
+return psz_string;
+}
+
+static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add )
+{
+char *psz_string;
+const char *psz_filter_type;
+
+module_t *p_obj = module_find( psz_name );
+if( !p_obj )
+{
+msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
+return;
+}
+
+if( module_provides( p_obj, "video splitter" ) )
+{
+psz_filter_type = "video-splitter";
+}
+else if( module_provides( p_obj, "video filter2" ) )
+{
+psz_filter_type = "video-filter";
+}
+else if( module_provides( p_obj, "sub source" ) )
+{
+psz_filter_type = "sub-source";
+}
+else if( module_provides( p_obj, "sub filter" ) )
+{
+psz_filter_type = "sub-filter";
+}
+else
+{
+msg_Err( p_intf, "Unknown video filter type." );
+return;
+}
+
+psz_string = ChangeFiltersString( p_intf, psz_filter_type, psz_name, b_add 
);
+if( !psz_string )
+return;
+
 /* Vout is not kept, so put that in the config */
 config_PutPsz( p_intf, psz_filter_type, psz_string );
 

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

[vlc-commits] Qt: save the activation state of audio filters

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 16:01:55 
2013 +0200| [d9c9be81204991562b563d0a7b57e9616fedebd8] | committer: Ludovic 
Fauvet

Qt: save the activation state of audio filters

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

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

diff --git a/modules/gui/qt4/components/extended_panels.cpp 
b/modules/gui/qt4/components/extended_panels.cpp
index 57c35e4..103ac7b 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -58,6 +58,7 @@
 #include  /* us_strtod */
 
 static char *ChangeFiltersString( struct intf_thread_t *p_intf, const char 
*psz_filter_type, const char *psz_name, bool b_add );
+static void ChangeAFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );
 static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add );
 
 #if 0
@@ -353,6 +354,26 @@ static char *ChangeFiltersString( struct intf_thread_t 
*p_intf, const char *psz_
 return psz_string;
 }
 
+static void ChangeAFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add )
+{
+char *psz_string;
+
+module_t *p_obj = module_find( psz_name );
+if( !p_obj )
+{
+msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
+return;
+}
+
+psz_string = ChangeFiltersString( p_intf, "audio-filter", psz_name, b_add 
);
+if( !psz_string )
+return;
+
+config_PutPsz( p_intf, "audio-filter", psz_string );
+
+free( psz_string );
+}
+
 static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char 
*psz_name, bool b_add )
 {
 char *psz_string;
@@ -1086,6 +1107,7 @@ AudioFilterControlWidget::~AudioFilterControlWidget()
 
 void AudioFilterControlWidget::enable( bool b_enable ) const
 {
+ChangeAFiltersString( p_intf, qtu(name), b_enable );
 playlist_EnableAudioFilter( THEPL, qtu(name), b_enable );
 }
 

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

[vlc-commits] Qt: do not extend the dialog minimum width for long lines

2013-07-10 Thread Ludovic Fauvet 
vlc | branch: master | Ludovic Fauvet  | Wed Jul 10 14:40:03 
2013 +0200| [1d1c5e1247a19eac1695af401cf30bef9ffa2673] | committer: Ludovic 
Fauvet

Qt: do not extend the dialog minimum width for long lines

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

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

diff --git a/modules/gui/qt4/components/extended_panels.cpp 
b/modules/gui/qt4/components/extended_panels.cpp
index d591001..acc9215 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -710,6 +710,7 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
   "Controls will automatically appear here.")
   , this );
 help->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+help->setWordWrap( true );
 layout->addWidget( help );
 setLayout( layout );
 }

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

[vlc-commits] OpenGL: Addition of XYZ to RGB conversion in GLSL

2013-07-10 Thread Nicolas Bertrand 
vlc/vlc-2.1 | branch: master | Nicolas Bertrand  | Tue 
Jul  9 15:59:37 2013 +0200| [cfeecf5f476a98d14c81900864b577160db4927a] | 
committer: Jean-Baptiste Kempf

OpenGL: Addition of XYZ to RGB conversion in GLSL

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

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

 modules/video_output/opengl.c |   60 ++---
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index a0d915d..0941805 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -340,6 +340,46 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t 
*vgl,
 vgl->ShaderSource(*shader, 1, &code, NULL);
 vgl->CompileShader(*shader);
 }
+
+static void BuildXYZFragmentShader(vout_display_opengl_t *vgl,
+   GLint *shader)
+{
+/* Shader for XYZ to RGB correction
+ * 3 steps :
+ *  - XYZ gamma correction
+ *  - XYZ to RGB matrix conversion
+ *  - reverse RGB gamma correction
+ */
+  const char *code =
+"#version " GLSL_VERSION "\n"
+PRECISION
+"uniform sampler2D Texture0;"
+"uniform vec4 xyz_gamma = vec4(2.6);"
+"uniform vec4 rgb_gamma = vec4(1.0/2.2);"
+// WARN: matrix Is filled column by column (not row !)
+"uniform mat4 matrix_xyz_rgb = mat4("
+"3.240454 , -0.9692660, 0.0556434, 0.0,"
+"   -1.5371385,  1.8760108, -0.2040259, 0.0,"
+"-0.4985314, 0.0415560, 1.0572252,  0.0,"
+"0.0,  0.0, 0.0,1.0 "
+" );"
+
+"varying vec4 TexCoord0;"
+"void main()"
+"{ "
+" vec4 v_in, v_out;"
+" v_in  = texture2D(Texture0, TexCoord0.st);"
+" v_in = pow(v_in, xyz_gamma);"
+" v_out = matrix_xyz_rgb * v_in ;"
+" v_out = pow(v_out, rgb_gamma) ;"
+" v_out = clamp(v_out, 0.0, 1.0) ;"
+" gl_FragColor = v_out;"
+"}";
+*shader = vgl->CreateShader(GL_FRAGMENT_SHADER);
+vgl->ShaderSource(*shader, 1, &code, NULL);
+vgl->CompileShader(*shader);
+}
+
 #endif
 
 vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
@@ -465,6 +505,7 @@ vout_display_opengl_t 
*vout_display_opengl_New(video_format_t *fmt,
 vgl->tex_type = GL_UNSIGNED_BYTE;
 /* Use YUV if possible and needed */
 bool need_fs_yuv = false;
+bool need_fs_xyz = false;
 bool need_fs_rgba = USE_OPENGL_ES == 2;
 float yuv_range_correction = 1.0;
 
@@ -498,6 +539,15 @@ vout_display_opengl_t 
*vout_display_opengl_New(video_format_t *fmt,
 }
 }
 
+if (fmt->i_chroma == VLC_CODEC_XYZ12) {
+vlc_fourcc_GetChromaDescription(fmt->i_chroma);
+need_fs_xyz   = true;
+vgl->fmt  = *fmt;
+vgl->fmt.i_chroma = VLC_CODEC_XYZ12;
+vgl->tex_format   = GL_RGB;
+vgl->tex_internal = GL_RGB;
+vgl->tex_type = GL_UNSIGNED_SHORT;
+}
 vgl->chroma = vlc_fourcc_GetChromaDescription(vgl->fmt.i_chroma);
 vgl->use_multitexture = vgl->chroma->plane_count > 1;
 
@@ -521,10 +571,14 @@ vout_display_opengl_t 
*vout_display_opengl_New(video_format_t *fmt,
 vgl->shader[1] =
 vgl->shader[2] = -1;
 vgl->local_count = 0;
-if (supports_shaders && (need_fs_yuv || need_fs_rgba)) {
+if (supports_shaders && (need_fs_yuv || need_fs_xyz|| need_fs_rgba)) {
 #ifdef SUPPORTS_SHADERS
-BuildYUVFragmentShader(vgl, &vgl->shader[0], &vgl->local_count,
-   vgl->local_value, fmt, yuv_range_correction);
+if (need_fs_xyz)
+BuildXYZFragmentShader(vgl, &vgl->shader[0]);
+else
+BuildYUVFragmentShader(vgl, &vgl->shader[0], &vgl->local_count,
+vgl->local_value, fmt, yuv_range_correction);
+
 BuildRGBAFragmentShader(vgl, &vgl->shader[1]);
 BuildVertexShader(vgl, &vgl->shader[2]);
 

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

[vlc-commits] Qt: add a shortcut to give the focus to the search entry in advanced prefs

2013-07-10 Thread Ludovic Fauvet 
vlc/vlc-2.1 | branch: master | Ludovic Fauvet  | Tue Jul  9 
00:33:39 2013 +0200| [19fb8488656f12aaeee1df24f4122346a7718a5c] | committer: 
Jean-Baptiste Kempf

Qt: add a shortcut to give the focus to the search entry in advanced prefs

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

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

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

diff --git a/modules/gui/qt4/dialogs/preferences.cpp 
b/modules/gui/qt4/dialogs/preferences.cpp
index bfa421a..1a18445 100644
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
 : QVLCDialog( parent, _p_intf )
@@ -165,6 +166,9 @@ void PrefsDialog::setAdvanced()
 CONNECT( current_filter, stateChanged(int),
  this, onlyLoadedToggled() );
 advanced_tree_panel->layout()->addWidget( current_filter );
+
+QShortcut *search = new QShortcut( QKeySequence( QKeySequence::Find ), 
tree_filter );
+CONNECT( search, activated(), tree_filter, setFocus() );
 }
 
 /* If don't have already and advanced TREE, then create it */

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

[vlc-commits] Qt: QVLCDial: move value in corner

2013-07-10 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Wed Jul 10 
09:28:21 2013 +0200| [126469035aacf57c94f3ef3089753e2c79573ddf] | committer: 
Francois Cartegnie

Qt: QVLCDial: move value in corner

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

 modules/gui/qt4/util/customwidgets.cpp |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/util/customwidgets.cpp 
b/modules/gui/qt4/util/customwidgets.cpp
index 8d19631..23a6150 100644
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -96,10 +96,13 @@ void VLCQDial::paintEvent( QPaintEvent *event )
 {
 QDial::paintEvent( event );
 QPainter painter( this );
-QRect rect = geometry();
 painter.setPen( QPen( palette().color( QPalette::WindowText ) ) );
-painter.drawText( QRectF( 0, rect.height() * 0.66, rect.width(), 
rect.height() ),
-  Qt::AlignHCenter, QString::number( value() ), 0 );
+float radius = 0.5 * 0.707106 * qMin( size().width(), size().height() );
+painter.drawText( QRectF( rect().center().x() + radius,
+  rect().center().y() + radius,
+  size().width(),
+  size().height() ),
+  0, QString::number( value() ), 0 );
 painter.end();
 }
 

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