[vlc-commits] authors: correct fox's name
vlc | branch: master | Rémi Denis-Courmont | Wed Jul 18 23:56:21 2012 +0300| [c6a5ad0b9022f92349b2019cde6deb28cdf4db3e] | committer: Rémi Denis-Courmont authors: correct fox's name > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6a5ad0b9022f92349b2019cde6deb28cdf4db3e --- AUTHORS |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 2c5b319..eac402c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -258,7 +258,6 @@ Rov Juvano Sabourin Gilles Sasha Koruga Sergey Radionov -Sreng Jean Sven Petai Thierry Reding Tomer Barletz @@ -479,6 +478,7 @@ Jan Van Boghout Jasper Alias Jean-Alexis Montignies Jean-Baptiste Le Stang +Jean Sreng Jeffrey Baker Jeroen Massar Jérôme Guilbaud ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] authors: correct fox's name
vlc | branch: master | Rémi Denis-Courmont | Wed Jul 18 23:56:21 2012 +0300| [8c8d596d3c64a2323c159fe32bf0d673a340e0fa] | committer: Rémi Denis-Courmont authors: correct fox's name > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c8d596d3c64a2323c159fe32bf0d673a340e0fa --- AUTHORS |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 2c5b319..06f6fd9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -258,7 +258,6 @@ Rov Juvano Sabourin Gilles Sasha Koruga Sergey Radionov -Sreng Jean Sven Petai Thierry Reding Tomer Barletz @@ -334,6 +333,7 @@ James Turner Janne Kujanpää Jarmo Torvinen Jason Scheunemann +Jean Sreng Jeff Lu Jeroen Ost Johann Ransay ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Tag 2.0.3 : VLC media player 2.0.3 - Twoflower
[vlc/vlc-2.0] [branch: refs/tags/2.0.3] Tag:1091be9427e9acf7df73944d842e9e24c237fce8 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git?a=tag;h=1091be9427e9acf7df73944d842e9e24c237fce8 Tagger: Felix Paul Kühne Date: Wed Jul 18 20:32:14 2012 +0200 VLC media player 2.0.3 - Twoflower This is the third bugfix release (and the fourth release) of the 2.0.x branch of VLC. This release mostly targets the Mac OS X platform and adds support for OS X Mountain Lion. It also fixes the Qt interface's appearance on Windows 8 and includes improvements for the flv and ape demuxers as well as the http access module. Additionally, it includes updates for 18 translations and adds support for Uzbek and Marathi. ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] aout: add --gain to control gain regardless of output module
vlc | branch: master | Rémi Denis-Courmont | Wed Jul 18
21:47:45 2012 +0300| [dcf3f71b3b48090881f8deab305cc31ea1067ca3] | committer:
Rémi Denis-Courmont
aout: add --gain to control gain regardless of output module
This linear gain works also for outputs with native volume or without
volume. (Obviously though, it does not work for digital pass-through).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dcf3f71b3b48090881f8deab305cc31ea1067ca3
---
src/audio_output/volume.c | 26 ++
src/libvlc-module.c |6 ++
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/audio_output/volume.c b/src/audio_output/volume.c
index afb7e67..791154e 100644
--- a/src/audio_output/volume.c
+++ b/src/audio_output/volume.c
@@ -145,7 +145,6 @@ int aout_volume_Amplify(aout_volume_t *vol, block_t *block)
static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str,
const audio_replay_gain_t *replay_gain)
{
-float gain = 0.;
unsigned mode = AUDIO_REPLAY_GAIN_MAX;
if (likely(str != NULL))
@@ -165,22 +164,33 @@ static float aout_ReplayGainSelect(vlc_object_t *obj,
const char *str,
}
/* */
-if (mode == AUDIO_REPLAY_GAIN_MAX)
-return 1.;
+float multiplier;
-if (replay_gain->pb_gain[mode])
-gain = replay_gain->pf_gain[mode]
- + var_InheritFloat (obj, "audio-replay-gain-preamp");
+if (mode == AUDIO_REPLAY_GAIN_MAX)
+{
+multiplier = 1.f;
+}
else
-gain = var_InheritFloat (obj, "audio-replay-gain-default");
+{
+float gain;
-float multiplier = pow (10., gain / 20.);
+if (replay_gain->pb_gain[mode])
+gain = replay_gain->pf_gain[mode]
+ + var_InheritFloat (obj, "audio-replay-gain-preamp");
+else
+gain = var_InheritFloat (obj, "audio-replay-gain-default");
+
+multiplier = pow (10., gain / 20.);
+}
if (replay_gain->pb_peak[mode]
&& var_InheritBool (obj, "audio-replay-gain-peak-protection")
&& replay_gain->pf_peak[mode] * multiplier > 1.0)
multiplier = 1.0f / replay_gain->pf_peak[mode];
+/* Command line / configuration gain */
+multiplier *= var_InheritFloat (obj, "gain");
+
return multiplier;
}
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a20f0c1..4c64b6b 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -149,6 +149,10 @@ static const char *const ppsz_snap_formats[] =
#define MONO_LONGTEXT N_("This will force a mono audio output.")
#endif
+#define GAIN_TEXT N_("Audio gain")
+#define GAIN_LONGTEXT N_( \
+"Thus linear gain will be applied to outputted audio.")
+
#define VOLUME_TEXT N_("Default audio volume")
#define VOLUME_LONGTEXT N_( \
"You can set the default audio output volume here.")
@@ -1470,6 +1474,8 @@ vlc_module_begin ()
add_bool( "audio", 1, AUDIO_TEXT, AUDIO_LONGTEXT, false )
change_safe ()
+add_float( "gain", 1., GAIN_TEXT, GAIN_LONGTEXT, true )
+change_float_range( 0., 8. )
add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, 0,
AOUT_VOLUME_MAX, VOLUME_TEXT,
VOLUME_LONGTEXT, false )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update-po
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf | Wed Jul 18 21:52:33 2012 +0200| [77aa89e8d7bd949d3c2946b130badb7c570023a6] | committer: Jean-Baptiste Kempf Update-po > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=77aa89e8d7bd949d3c2946b130badb7c570023a6 --- po/ach.po | 1555 +- po/af.po| 1555 +- po/am.po| 1555 +- po/ar.po| 1555 +- po/ast.po | 1555 +- po/be.po| 1556 +- po/bg.po| 1555 +- po/bn.po| 1555 +- po/br.po| 1555 +- po/ca.po| 1555 +- po/cgg.po | 1555 +- po/ckb.po | 1555 +- po/co.po| 1555 +- po/cs.po| 1555 +- po/da.po| 1555 +- po/de.po| 1555 +- po/el.po| 1556 +- po/en_GB.po | 1555 +- po/es.po| 1555 +- po/et.po| 1556 +- po/eu.po| 1556 +- po/fa.po| 1555 +- po/ff.po| 1555 +- po/fi.po| 1555 +- po/fr.po| 1556 +- po/fur.po | 1555 +- po/ga.po| 1555 +- po/gd.po| 1559 +- po/gl.po| 1556 +- po/he.po| 1555 +- po/hi.po| 1555 +- po/hr.po| 1555 +- po/hu.po| 1556 +- po/hy.po| 1555 +- po/id.po| 1555 +- po/is.po| 1555 +- po/it.po| 1556 +- po/ja.po| 1556 +- po/ka.po| 1555 +- po/kk.po| 1555 +- po/km.po| 1555 +- po/kmr.po | 1555 +- po/ko.po| 1555 +- po/lg.po| 1555 +- po/lt.po| 1555 +- po/lv.po| 1555 +- po/mk.po| 1555 +- po/ml.po| 1555 +- po/mn.po| 1555 +- po/mr.po| 1556 +- po/ms.po| 1555 +- po/my.po| 1555 +- po/nb.po| 1555 +- po/ne.po| 1555 +- po/nl.po| 1556 +- po/nn.po| 1555 +- po/oc.po| 1555 +- po/pa.po| 1555 +- po/pl.po| 1556 +- po/ps.po| 1555 +--
[vlc-commits] NEWS: fix typos
vlc/vlc-2.0 | branch: master | Felix Paul Kühne | Wed Jul 18 17:15:42 2012 +0200| [e6139014b8aac0aa4c0ad32c67037ed74b0c6983] | committer: Felix Paul Kühne NEWS: fix typos > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e6139014b8aac0aa4c0ad32c67037ed74b0c6983 --- NEWS |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ba9974e..2316979 100644 --- a/NEWS +++ b/NEWS @@ -21,8 +21,8 @@ Translations: * Updates for Breton, Czech, Dutch, Gaelic, German, Hebrew, Hindi, Icelandic, Japanese, Khmer, Korean, Polish, Russian, Simplified Chinese, Slovenian, Thai, Turkish and Walloon - * New translation to Uzbek and Marathi - * Fix activation of the Gaelic and the Thai translation + * New translations to Uzbek and Marathi + * Fix activation of Gaelic and Thai translations Changes between 2.0.1 and 2.0.2: ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libmp4: Add function MP4_BoxGetSmooBox()
vlc | branch: master | Frédéric Yhuel | Wed Jul 18
16:52:35 2012 +0200| [bf1ee347ed9069c4b4f752f553b9577b21b7edd5] | committer:
Jean-Baptiste Kempf
libmp4: Add function MP4_BoxGetSmooBox()
also modify MP4_BoxGetNextChunk() so that a initialization
segment which has been put between two chunks is properly handled.
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bf1ee347ed9069c4b4f752f553b9577b21b7edd5
---
modules/demux/mp4/libmp4.c | 51
modules/demux/mp4/libmp4.h |1 +
2 files changed, 52 insertions(+)
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 03da565..81fc6b0 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3440,6 +3440,39 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
free( p_box );
}
+/* SmooBox is a very simple MP4 box, VLC specific, used only for the
stream_filter to
+ * send information to the demux. SmooBox is actually a simplified moov box
(we wanted
+ * to avoid the hassle of building a moov box at the stream_filter level) */
+MP4_Box_t *MP4_BoxGetSmooBox( stream_t *s )
+{
+/* p_chunk is a virtual root container for the smoo box */
+MP4_Box_t *p_chunk;
+MP4_Box_t *p_smoo;
+
+p_chunk = calloc( 1, sizeof( MP4_Box_t ) );
+if( unlikely( p_chunk == NULL ) )
+return NULL;
+
+p_chunk->i_type = ATOM_root;
+p_chunk->i_shortsize = 1;
+
+p_smoo = MP4_ReadBox( s, p_chunk );
+if( !p_smoo || p_smoo->i_type != ATOM_uuid || CmpUUID( &p_smoo->i_uuid,
&SmooBoxUUID ) )
+{
+msg_Warn( s, "no smoo box found!");
+goto error;
+}
+
+p_chunk->p_first = p_smoo;
+p_chunk->p_last = p_smoo;
+
+return p_chunk;
+
+error:
+free( p_chunk );
+return NULL;
+}
+
MP4_Box_t *MP4_BoxGetInitFrag( stream_t *s )
{
/* p_chunk is a virtual root container for the ftyp and moov boxes */
@@ -3497,6 +3530,24 @@ MP4_Box_t *MP4_BoxGetNextChunk( stream_t *s )
MP4_Box_t *p_chunk;
MP4_Box_t *p_moof = NULL;
MP4_Box_t *p_sidx = NULL;
+MP4_Box_t *p_tmp_box = NULL;
+
+p_tmp_box = calloc( 1, sizeof( MP4_Box_t ) );
+if( unlikely( p_tmp_box == NULL ) )
+return NULL;
+
+/* We might get a ftyp box or a SmooBox */
+MP4_ReadBoxCommon( s, p_tmp_box );
+
+if( (p_tmp_box->i_type == ATOM_uuid && !CmpUUID( &p_tmp_box->i_uuid,
&SmooBoxUUID )) )
+{
+return MP4_BoxGetSmooBox( s );
+}
+else if( p_tmp_box->i_type == ATOM_ftyp )
+{
+return MP4_BoxGetInitFrag( s );
+}
+free( p_tmp_box );
p_chunk = calloc( 1, sizeof( MP4_Box_t ) );
if( unlikely( p_chunk == NULL ) )
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index c1f72fd..0883e9d 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -1476,6 +1476,7 @@ static const UUID_t StraBoxUUID = {
{ 0xb0, 0x3e, 0xf7, 0x70, 0x33, 0xbd, 0x4b, 0xac,
0x96, 0xc7, 0xbf, 0x25, 0xf9, 0x7e, 0x24, 0x47 } };
+MP4_Box_t *MP4_BoxGetSmooBox( stream_t * );
/*
* MP4_BoxGetInitFrag : Parse the initialization segment.
*
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libmp4: Add function MP4_BoxGetSmooBox()
vlc | branch: master | Frédéric Yhuel | Wed Jul 18
16:52:35 2012 +0200| [24a31a6252b6b3503e49a190c1ab7c0e7c9a05fd] | committer:
Jean-Baptiste Kempf
libmp4: Add function MP4_BoxGetSmooBox()
also modify MP4_BoxGetNextChunk() so that a initialization
segment which has been put between two chunks is properly handled.
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24a31a6252b6b3503e49a190c1ab7c0e7c9a05fd
---
modules/demux/mp4/libmp4.c | 51
modules/demux/mp4/libmp4.h |1 +
2 files changed, 52 insertions(+)
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 03da565..92ca42b 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3440,6 +3440,39 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
free( p_box );
}
+/* SmooBox is a very simple MP4 box, VLC specific, used only for the
stream_filter to
+ * send information to the demux. SmooBox is actually a simplified moov box
(we wanted
+ * to avoid the hassle of building a moov box at the stream_filter level) */
+MP4_Box_t *MP4_BoxGetSmooBox( stream_t *s )
+{
+/* p_chunk is a virtual root container for the smoo box */
+MP4_Box_t *p_chunk;
+MP4_Box_t *p_smoo;
+
+p_chunk = calloc( 1, sizeof( MP4_Box_t ) );
+if( unlikely( p_chunk == NULL ) )
+return NULL;
+
+p_chunk->i_type = ATOM_root;
+p_chunk->i_shortsize = 1;
+
+p_smoo = MP4_ReadBox( s, p_chunk );
+if( !p_smoo || p_smoo->i_type != ATOM_uuid || CmpUUID( &p_smoo->i_uuid,
&SmooBoxUUID ) )
+{
+msg_Warn( s, "no smoo box found!");
+goto error;
+}
+
+p_chunk->p_first = p_smoo;
+p_chunk->p_last = p_smoo;
+
+return p_chunk;
+
+error:
+free( p_chunk );
+return NULL;
+}
+
MP4_Box_t *MP4_BoxGetInitFrag( stream_t *s )
{
/* p_chunk is a virtual root container for the ftyp and moov boxes */
@@ -3497,6 +3530,24 @@ MP4_Box_t *MP4_BoxGetNextChunk( stream_t *s )
MP4_Box_t *p_chunk;
MP4_Box_t *p_moof = NULL;
MP4_Box_t *p_sidx = NULL;
+MP4_Box_t *p_tmp_box = NULL;
+
+p_tmp_box = calloc( 1, sizeof( MP4_Box_t ) );
+if( unlikely( p_tmp_box == NULL ) )
+return NULL;
+
+/* We might get a ftyp box or a SmooBox */
+MP4_ReadBoxCommon( s, p_tmp_box );
+
+if( (p_tmp_box->i_type == ATOM_uuid && !CmpUUID( &p_trash->i_uuid,
&SmooBoxUUID )) )
+{
+return MP4_BoxGetSmooBox( s );
+}
+else if( p_tmp_box->i_type == ATOM_ftyp )
+{
+return MP4_BoxGetInitFrag( s );
+}
+free( p_tmp_box );
p_chunk = calloc( 1, sizeof( MP4_Box_t ) );
if( unlikely( p_chunk == NULL ) )
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index c1f72fd..0883e9d 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -1476,6 +1476,7 @@ static const UUID_t StraBoxUUID = {
{ 0xb0, 0x3e, 0xf7, 0x70, 0x33, 0xbd, 0x4b, 0xac,
0x96, 0xc7, 0xbf, 0x25, 0xf9, 0x7e, 0x24, 0x47 } };
+MP4_Box_t *MP4_BoxGetSmooBox( stream_t * );
/*
* MP4_BoxGetInitFrag : Parse the initialization segment.
*
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libmp4: Parse StraBox and SmooBox
vlc | branch: master | Frédéric Yhuel | Wed Jul 18
16:52:34 2012 +0200| [e93131818521d921e4ae7aa219b899c7c66676c9] | committer:
Jean-Baptiste Kempf
libmp4: Parse StraBox and SmooBox
SmooBox is a very simple MP4 box, VLC specific, used only
for the Smooth Streaming module to send information to the demux.
SmooBox is actually a simplified moov box (we wanted to avoid
the hassle of building a moov box at the stream_filter level).
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e93131818521d921e4ae7aa219b899c7c66676c9
---
modules/demux/mp4/libmp4.c | 58
modules/demux/mp4/libmp4.h | 28 +
2 files changed, 86 insertions(+)
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 5a89935..03da565 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -475,12 +475,66 @@ static void MP4_FreeBox_tfrf( MP4_Box_t *p_box )
FREENULL( p_box->data.p_tfrf->p_tfrf_data_fields );
}
+static int MP4_ReadBox_stra( stream_t *p_stream, MP4_Box_t *p_box )
+{
+MP4_READBOX_ENTER( MP4_Box_data_stra_t );
+MP4_Box_data_stra_t *p_stra = p_box->data.p_stra;
+
+uint8_t i_reserved;
+MP4_GET1BYTE( p_stra->i_es_cat );
+MP4_GET1BYTE( i_reserved );
+MP4_GET2BYTES( p_stra->i_track_ID );
+
+MP4_GET4BYTES( p_stra->i_timescale );
+MP4_GET8BYTES( p_stra->i_duration );
+
+MP4_GET4BYTES( p_stra->FourCC );
+MP4_GET4BYTES( p_stra->Bitrate );
+MP4_GET4BYTES( p_stra->MaxWidth );
+MP4_GET4BYTES( p_stra->MaxHeight );
+MP4_GET4BYTES( p_stra->SamplingRate );
+MP4_GET4BYTES( p_stra->Channels );
+MP4_GET4BYTES( p_stra->BitsPerSample );
+MP4_GET4BYTES( p_stra->PacketSize );
+MP4_GET4BYTES( p_stra->AudioTag );
+MP4_GET2BYTES( p_stra->nBlockAlign );
+
+MP4_GET1BYTE( i_reserved );
+MP4_GET1BYTE( i_reserved );
+MP4_GET1BYTE( i_reserved );
+uint8_t codec_data_length;
+MP4_GET1BYTE( codec_data_length );
+p_stra->CodecPrivateData = malloc( codec_data_length + 1);
+if( unlikely( p_stra->CodecPrivateData == NULL ) )
+goto error;
+MP4_GETSTRINGZ( p_stra->CodecPrivateData );
+
+#ifdef MP4_VERBOSE
+msg_Dbg( p_stream, "es_cat is %"PRIu8", birate is %"PRIu32", "\
+"CodecPrivateData is %s", p_stra->i_es_cat,
+p_stra->Bitrate, p_stra->CodecPrivateData );
+#endif
+
+MP4_READBOX_EXIT( 1 );
+error:
+MP4_READBOX_EXIT( 0 );
+}
+
+static void MP4_FreeBox_stra( MP4_Box_t *p_box )
+{
+FREENULL( p_box->data.p_stra->CodecPrivateData );
+}
+
static int MP4_ReadBox_uuid( stream_t *p_stream, MP4_Box_t *p_box )
{
if( !CmpUUID( &p_box->i_uuid, &TfrfBoxUUID ) )
return MP4_ReadBox_tfrf( p_stream, p_box );
if( !CmpUUID( &p_box->i_uuid, &TfxdBoxUUID ) )
return MP4_ReadBox_tfxd( p_stream, p_box );
+if( !CmpUUID( &p_box->i_uuid, &SmooBoxUUID ) )
+return MP4_ReadBoxContainer( p_stream, p_box );
+if( !CmpUUID( &p_box->i_uuid, &StraBoxUUID ) )
+return MP4_ReadBox_stra( p_stream, p_box );
msg_Warn( p_stream, "Unknown uuid type box" );
return 1;
@@ -492,6 +546,10 @@ static void MP4_FreeBox_uuid( MP4_Box_t *p_box )
return MP4_FreeBox_tfrf( p_box );
if( !CmpUUID( &p_box->i_uuid, &TfxdBoxUUID ) )
return MP4_FreeBox_Common( p_box );
+if( !CmpUUID( &p_box->i_uuid, &SmooBoxUUID ) )
+return MP4_FreeBox_Common( p_box );
+if( !CmpUUID( &p_box->i_uuid, &StraBoxUUID ) )
+return MP4_FreeBox_stra( p_box );
}
static int MP4_ReadBox_sidx( stream_t *p_stream, MP4_Box_t *p_box )
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 9485c94..c1f72fd 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -1128,6 +1128,26 @@ typedef struct
uint8_t *p_sample_number;
} MP4_Box_data_tfra_t;
+typedef struct
+{
+uint64_t i_duration;
+uint32_t i_timescale;
+uint16_t i_track_ID;
+uint8_t i_es_cat;
+
+uint32_t FourCC;
+uint32_t Bitrate;
+uint32_t MaxWidth;
+uint32_t MaxHeight;
+uint32_t SamplingRate;
+uint32_t Channels;
+uint32_t BitsPerSample;
+uint32_t PacketSize;
+uint32_t AudioTag;
+uint16_t nBlockAlign;
+char *CodecPrivateData;
+} MP4_Box_data_stra_t;
+
/*
typedef struct MP4_Box_data__s
{
@@ -1178,6 +1198,7 @@ typedef union MP4_Box_data_s
MP4_Box_data_tfra_t *p_tfra;
MP4_Box_data_mfro_t *p_mfro;
+MP4_Box_data_stra_t *p_stra;
MP4_Box_data_stsz_t *p_stsz;
MP4_Box_data_stz2_t *p_stz2;
@@ -1447,6 +1468,13 @@ static const UUID_t TfxdBoxUUID = {
{ 0x6d, 0x1d, 0x9b, 0x05, 0x42, 0xd5, 0x44, 0xe6,
0x80, 0xe2, 0x14, 0x1d, 0xaf, 0xf7, 0x57, 0xb2 } };
+static const UUID_t SmooBoxUUID = {
+{ 0xe1, 0xda, 0x72, 0xba, 0x24, 0xd7, 0x43, 0xc3,
+ 0xa6, 0xa5, 0x1b, 0x57, 0x59, 0xa1, 0xa9, 0x2c } };
[vlc-commits] l10n: Thai update
vlc/vlc-2.0 | branch: master | T. Chomphuming | Wed Jul 18 15:57:27 2012 +0200| [778305c7eea4933666cbc1d1d01753d167137627] | committer: Christoph Miebach l10n: Thai update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=778305c7eea4933666cbc1d1d01753d167137627 --- po/th.po | 2016 +++--- 1 file changed, 1001 insertions(+), 1015 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=778305c7eea4933666cbc1d1d01753d167137627 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS: mention Thai update
vlc/vlc-2.0 | branch: master | Christoph Miebach | Wed Jul 18 16:00:39 2012 +0200| [87b81d3c3b85807f72b94626e28075ca7615077e] | committer: Christoph Miebach NEWS: mention Thai update > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=87b81d3c3b85807f72b94626e28075ca7615077e --- NEWS |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index db21bfa..ba9974e 100644 --- a/NEWS +++ b/NEWS @@ -20,7 +20,7 @@ Qt: Translations: * Updates for Breton, Czech, Dutch, Gaelic, German, Hebrew, Hindi, Icelandic, Japanese, Khmer, Korean, Polish, Russian, Simplified Chinese, Slovenian, - Turkish and Walloon + Thai, Turkish and Walloon * New translation to Uzbek and Marathi * Fix activation of the Gaelic and the Thai translation ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: vlc object handling improvements (refs #6883)
vlc | branch: master | Felix Paul Kühne | Wed Jul 18
13:19:26 2012 +0200| [69da2065f6df72343a04a93e3cabbc40237d43be] | committer:
Felix Paul Kühne
macosx: vlc object handling improvements (refs #6883)
This should solve a few problems on termination.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=69da2065f6df72343a04a93e3cabbc40237d43be
---
modules/gui/macosx/MainMenu.m | 13 +
modules/gui/macosx/VideoView.m |6 --
modules/gui/macosx/bookmarks.m | 11 ++-
modules/gui/macosx/controls.m | 14 +-
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index d2eff79..f910708 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -462,15 +462,13 @@ static VLCMainMenu *_o_sharedInstance = nil;
[self setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
var: "visual" selector:
@selector(toggleVar:)];
-vlc_object_release( (vlc_object_t *)p_aout );
+vlc_object_release( p_aout );
}
vout_thread_t * p_vout = input_GetVout( p_input );
if( p_vout != NULL )
{
-vlc_object_t * p_dec_obj;
-
[self setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t
*)p_vout
var: "aspect-ratio" selector:
@selector(toggleVar:)];
@@ -488,7 +486,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
(vlc_object_t *)p_vout var:"postprocess" selector:
@selector(toggleVar:)];
#endif
-vlc_object_release( (vlc_object_t *)p_vout );
+vlc_object_release( p_vout );
[self refreshVoutDeviceMenu:nil];
[self setSubmenusEnabled: YES];
@@ -1335,13 +1333,11 @@ static VLCMainMenu *_o_sharedInstance = nil;
if( p_vout != NULL )
{
if( [o_title isEqualToString: _NS("Float on Top")] )
-{
[o_mi setState: var_GetBool( p_vout, "video-on-top" )];
-}
bEnabled = TRUE;
-vlc_object_release( (vlc_object_t *)p_vout );
+vlc_object_release( p_vout );
}
}
if( [o_title isEqualToString: _NS("Fullscreen")] )
@@ -1403,7 +1399,8 @@ bool b_telx = p_input && var_GetInteger( p_input,
"teletext-es" ) >= 0;
- (void)dealloc
{
-vlc_object_release( _vlc_object );
+if( _vlc_object )
+vlc_object_release( _vlc_object );
if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
free( value.psz_string );
free( psz_name );
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index c20feb1..445f224 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -111,7 +111,7 @@ int DeviceCallback( vlc_object_t *p_this, const char
*psz_variable,
- (void)closeVout
{
vout_thread_t * p_vout = getVout();
-if( !p_vout )
+if( p_vout )
{
var_DelCallback( p_vout, "video-device", DeviceCallback, NULL );
vlc_object_release( p_vout );
@@ -168,10 +168,12 @@ int DeviceCallback( vlc_object_t *p_this, const char
*psz_variable,
val.i_int |= (int)CocoaKeyToVLC( key );
var_Set( p_vout->p_libvlc, "key-pressed", val );
}
-vlc_object_release( p_vout );
}
else
msg_Dbg( VLCIntf, "could not send keyevent to VLC core" );
+
+if (p_vout)
+vlc_object_release( p_vout );
}
else
[super keyDown: o_event];
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index 500375b..d07b8d1 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -73,6 +73,9 @@ static VLCBookmarks *_o_sharedInstance = nil;
- (void)dealloc
{
+if (p_old_input)
+vlc_object_release( p_old_input );
+
[super dealloc];
}
@@ -155,9 +158,15 @@ static VLCBookmarks *_o_sharedInstance = nil;
int row;
row = [o_tbl_dataTable selectedRow];
-if( !p_input && row < 0 )
+if( !p_input )
return;
+if( row < 0 )
+{
+vlc_object_release( p_input );
+return;
+}
+
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks ) != VLC_SUCCESS )
{
diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index f03f557..f21da4f 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -163,7 +163,7 @@
if( p_vout != NULL )
{
var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_POSITION
);
-vlc_object_release( (vlc_object_t *)p_vout );
+vlc_object_release( p_vout );
}
vlc_object_release( p_input );
}
@@ -359,14 +359,10 @@
/* Escape */
[vlc-commits] audioscrobbler: prevent an endless loop inside the main loop
vlc/vlc-2.0 | branch: master | Fabian Keil | Sun Jun 17 13:56:47 2012 +0200| [ac526dbdc0eef846feabad69fea1fc85731b218a] | committer: Felix Paul Kühne audioscrobbler: prevent an endless loop inside the main loop Fixes the clang complaint: The right operand of '<' is a garbage value This might fix #6286. Signed-off-by: Rafaël Carré (cherry picked from commit 8cdc20d360fbefa12671abf8ff30c41384d110c7) Signed-off-by: Felix Paul Kühne > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ac526dbdc0eef846feabad69fea1fc85731b218a --- modules/misc/audioscrobbler.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index 33c1238..ba79ce2 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -768,7 +768,7 @@ static void Run(intf_thread_t *p_intf) boolb_handshaked = false; /* data about audioscrobbler session */ -mtime_t next_exchange; /**< when can we send data */ +mtime_t next_exchange = -1; /**< when can we send data */ unsigned inti_interval; /**< waiting interval (secs)*/ intf_sys_t *p_sys = p_intf->p_sys; ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Walloon update
vlc/vlc-2.0 | branch: master | Gaëtan Rousseaux | Thu Jul 12 15:22:22 2012 +0200| [34401fe26011daf6926f4095054b5b0643c595f6] | committer: Christoph Miebach l10n: Walloon update > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=34401fe26011daf6926f4095054b5b0643c595f6 --- po/wa.po | 1310 -- 1 file changed, 840 insertions(+), 470 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=34401fe26011daf6926f4095054b5b0643c595f6 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] audioscrobbler: prevent an endless loop inside the main loop
vlc/vlc-2.0 | branch: master | Fabian Keil | Sun Jun 17 13:56:47 2012 +0200| [2707b512a4bceabd9004ea71c67f58aa4aef0560] | committer: Christoph Miebach audioscrobbler: prevent an endless loop inside the main loop Fixes the clang complaint: The right operand of '<' is a garbage value This might fix #6286. Signed-off-by: Rafaël Carré (cherry picked from commit 8cdc20d360fbefa12671abf8ff30c41384d110c7) Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=2707b512a4bceabd9004ea71c67f58aa4aef0560 --- modules/misc/audioscrobbler.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index 33c1238..ba79ce2 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -768,7 +768,7 @@ static void Run(intf_thread_t *p_intf) boolb_handshaked = false; /* data about audioscrobbler session */ -mtime_t next_exchange; /**< when can we send data */ +mtime_t next_exchange = -1; /**< when can we send data */ unsigned inti_interval; /**< waiting interval (secs)*/ intf_sys_t *p_sys = p_intf->p_sys; ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Merge branch 'master' of git.videolan.org:vlc/vlc-2.0
vlc/vlc-2.0 | branch: master | Christoph Miebach | Wed Jul 18 12:40:18 2012 +0200| [329f8710a0e680f4af0906c93a45ea3ddea397c7] | committer: Christoph Miebach Merge branch 'master' of git.videolan.org:vlc/vlc-2.0 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=329f8710a0e680f4af0906c93a45ea3ddea397c7 --- ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS for 2.0.3
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf | Tue Jul 17 10:23:05 2012 +0200| [07ac593c2c9194e190547e51b2779df41346c5de] | committer: Christoph Miebach NEWS for 2.0.3 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=07ac593c2c9194e190547e51b2779df41346c5de --- NEWS | 28 +++- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 4fdf297..db21bfa 100644 --- a/NEWS +++ b/NEWS @@ -1,18 +1,28 @@ Changes between 2.0.2 and 2.0.3: +Access: + * Fix some HTTP request that broke some radio channels + +Demuxers: + * Fix support for some flv files (notably joined) + * Fix a crash when opening ape files with ID3v1 tags + Mac OS X: -* Add GateKeeper support -* Fix handling for some hotkeys -* Fix fullscreen toggle over extra interfaces -* Minor bugfixes and improvements + * Add GateKeeper support + * Fix handling for some hotkeys + * Fix fullscreen toggle over extra interfaces + * Minor bugfixes and improvements + +Qt: + * Fix Windows 8 interface style Translations: -* Updates for Breton, Czech, Dutch, Gaelic, German, Hebrew, Hindi, Icelandic, - Japanese, Khmer, Korean, Polish, Russian, Simplified Chinese, Slovenian, - Turkish and Walloon -* New translation to Uzbek and Marathi -* Fix activation of the Gaelic and the Thai translation + * Updates for Breton, Czech, Dutch, Gaelic, German, Hebrew, Hindi, Icelandic, + Japanese, Khmer, Korean, Polish, Russian, Simplified Chinese, Slovenian, + Turkish and Walloon + * New translation to Uzbek and Marathi + * Fix activation of the Gaelic and the Thai translation Changes between 2.0.1 and 2.0.2: ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: vlc object handling improvements (refs #6883)
vlc/vlc-2.0 | branch: master | Felix Paul Kühne | Wed
Jul 18 01:00:04 2012 +0200| [5c9e3abda1bb9a080d1eafe41db1d76f4c503d2d] |
committer: Christoph Miebach
macosx: vlc object handling improvements (refs #6883)
should solve a few problems on termination
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5c9e3abda1bb9a080d1eafe41db1d76f4c503d2d
---
modules/gui/macosx/MainMenu.m | 13 +
modules/gui/macosx/VideoView.m |6 --
modules/gui/macosx/bookmarks.m | 11 ++-
modules/gui/macosx/controls.m | 14 +-
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 4f4456a..bc0b93f 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -441,15 +441,13 @@ static VLCMainMenu *_o_sharedInstance = nil;
[self setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
var: "visual" selector:
@selector(toggleVar:)];
-vlc_object_release( (vlc_object_t *)p_aout );
+vlc_object_release( p_aout );
}
vout_thread_t * p_vout = input_GetVout( p_input );
if( p_vout != NULL )
{
-vlc_object_t * p_dec_obj;
-
[self setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t
*)p_vout
var: "aspect-ratio" selector:
@selector(toggleVar:)];
@@ -467,7 +465,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
(vlc_object_t *)p_vout var:"postprocess" selector:
@selector(toggleVar:)];
#endif
-vlc_object_release( (vlc_object_t *)p_vout );
+vlc_object_release( p_vout );
[self refreshVoutDeviceMenu:nil];
[self setSubmenusEnabled: YES];
@@ -1233,13 +1231,11 @@ static VLCMainMenu *_o_sharedInstance = nil;
if( p_vout != NULL )
{
if( [o_title isEqualToString: _NS("Float on Top")] )
-{
[o_mi setState: var_GetBool( p_vout, "video-on-top" )];
-}
bEnabled = TRUE;
-vlc_object_release( (vlc_object_t *)p_vout );
+vlc_object_release( p_vout );
}
}
if( [o_title isEqualToString: _NS("Fullscreen")] )
@@ -1301,7 +1297,8 @@ bool b_telx = p_input && var_GetInteger( p_input,
"teletext-es" ) >= 0;
- (void)dealloc
{
-vlc_object_release( _vlc_object );
+if( _vlc_object )
+vlc_object_release( _vlc_object );
if( (i_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
free( value.psz_string );
free( psz_name );
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index b191bc7..55d5204 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -109,7 +109,7 @@ int DeviceCallback( vlc_object_t *p_this, const char
*psz_variable,
- (void)closeVout
{
vout_thread_t * p_vout = getVout();
-if( !p_vout )
+if( p_vout )
{
var_DelCallback( p_vout, "video-device", DeviceCallback, NULL );
vlc_object_release( p_vout );
@@ -166,10 +166,12 @@ int DeviceCallback( vlc_object_t *p_this, const char
*psz_variable,
val.i_int |= (int)CocoaKeyToVLC( key );
var_Set( p_vout->p_libvlc, "key-pressed", val );
}
-vlc_object_release( p_vout );
}
else
msg_Dbg( VLCIntf, "could not send keyevent to VLC core" );
+
+if (p_vout)
+vlc_object_release( p_vout );
}
else
[super keyDown: o_event];
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index f0ad4fc..2cc0e44 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -73,6 +73,9 @@ static VLCBookmarks *_o_sharedInstance = nil;
- (void)dealloc
{
+if (p_old_input)
+vlc_object_release( p_old_input );
+
[super dealloc];
}
@@ -155,9 +158,15 @@ static VLCBookmarks *_o_sharedInstance = nil;
int row;
row = [o_tbl_dataTable selectedRow];
-if( !p_input && row < 0 )
+if( !p_input )
return;
+if (row < 0)
+{
+vlc_object_release( p_input );
+return;
+}
+
if( input_Control( p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks ) != VLC_SUCCESS )
{
diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index ba6d9a0..871526a 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -163,7 +163,7 @@
if( p_vout != NULL )
{
var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_POSITION
);
-vlc_object_release( (vlc_object_t *)p_vout );
+vlc_object_release( p_vout );
}
vlc_object_release( p_input );
}
@@ -359,14 +359,10 @@
/* Escape
[vlc-commits] Typos, name spelling
vlc/vlc-2.0 | branch: master | Christoph Miebach | Mon Jul 16 16:16:50 2012 +0200| [b125b61565d2e886c371d83bcb4f5f02df951390] | committer: Christoph Miebach Typos, name spelling > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b125b61565d2e886c371d83bcb4f5f02df951390 --- AUTHORS |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 65938a9..a99439e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -571,7 +571,7 @@ airplanez - Korean Ajith Manjula - Sinhala Alexander Didebulidze - Georgian Alexander Henket - Dutch -Alexander Law - Russian +Alexander Lakhin - Russian Alexey Lugin - Ukrainian Alexey Salmin - Russian Alfred John - Acoli @@ -643,7 +643,7 @@ Jon Stødle - Norwegian Nynorsk Jouni Kähkönen - Finnish Juha Jeronen - Finnish Kai Hermann - German -Kamil Páral - Czech +Kamil Páral - Czech Kang Jeong-Hee - Korean Kaya Zeren - Turkish Khin Mi Mi Aung - Burmese @@ -665,7 +665,7 @@ Mathias C. Berens, welcome-soft - German Mattias Põldaru - Estonian Md. Rezwan Shahid - Bengali Meelad Zakaria - Persian -Michael Bauer - Gaelic (Scottish) +Michael Bauer - Gaelic; Scottish Gaelic Michał Trzebiatowski - Polish Mihkel Kirjutas - Estonian Mindaugas Baranauskas - Lithuanian ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Typos, more languages are updated
vlc/vlc-2.0 | branch: master | Christoph Miebach | Mon Jul 16 16:18:02 2012 +0200| [7213a48b3ac95bf37a3aa5fd7e6a36a0ed7229ae] | committer: Christoph Miebach Typos, more languages are updated > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=7213a48b3ac95bf37a3aa5fd7e6a36a0ed7229ae --- NEWS |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index bc140aa..4fdf297 100644 --- a/NEWS +++ b/NEWS @@ -8,11 +8,11 @@ Mac OS X: * Minor bugfixes and improvements Translations: -* Updates for Breton, Dutch, Gaelic, German, Hebrew, Icelandic, - Japanese, Khmer, Korean, Polish, Simplified Chinese, Slovenian, Turkish - and Walloon +* Updates for Breton, Czech, Dutch, Gaelic, German, Hebrew, Hindi, Icelandic, + Japanese, Khmer, Korean, Polish, Russian, Simplified Chinese, Slovenian, + Turkish and Walloon * New translation to Uzbek and Marathi -* Fix activation of the Gaellic translation +* Fix activation of the Gaelic and the Thai translation Changes between 2.0.1 and 2.0.2: ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
vlc/vlc-2.0 | branch: master | Rui Zhang | Thu Jul 12
19:59:25 2012 +0800| [fa21a4ab8d241233ae08c5c30898db629a81caee] | committer:
Christoph Miebach
avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
Signed-off-by: Jean-Baptiste Kempf
(cherry picked from commit 352ea7df94b18869277457c79e7d5c10f388f075)
Signed-off-by: Jean-Baptiste Kempf
In fact, it closes #7145
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=fa21a4ab8d241233ae08c5c30898db629a81caee
---
modules/demux/avformat/demux.c |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 3264b11..ada3849 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -571,8 +571,13 @@ static int Demux( demux_t *p_demux )
int64_t i_start_time;
/* Read a frame */
-if( av_read_frame( p_sys->ic, &pkt ) )
+int i_av_ret = av_read_frame( p_sys->ic, &pkt );
+if( i_av_ret )
{
+/* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
+if( i_av_ret == AVERROR(EAGAIN) )
+return 1;
+
return 0;
}
if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Russian update
vlc/vlc-2.0 | branch: master | Alexander Lakhin | Mon Jul 16 16:14:16 2012 +0200| [b2df6e1a6b3388d0b35e28f5a6419859a3bad3d7] | committer: Christoph Miebach l10n: Russian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b2df6e1a6b3388d0b35e28f5a6419859a3bad3d7 --- po/ru.po | 113 -- 1 file changed, 51 insertions(+), 62 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=b2df6e1a6b3388d0b35e28f5a6419859a3bad3d7 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n NEWS
vlc/vlc-2.0 | branch: master | Felix Paul Kühne | Mon Jul 16 14:42:05 2012 +0200| [937eb966e66f85efadce411505d6748450da6501] | committer: Christoph Miebach l10n NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=937eb966e66f85efadce411505d6748450da6501 --- NEWS |7 +++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index a1a96e0..bc140aa 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,13 @@ Mac OS X: * Fix fullscreen toggle over extra interfaces * Minor bugfixes and improvements +Translations: +* Updates for Breton, Dutch, Gaelic, German, Hebrew, Icelandic, + Japanese, Khmer, Korean, Polish, Simplified Chinese, Slovenian, Turkish + and Walloon +* New translation to Uzbek and Marathi +* Fix activation of the Gaellic translation + Changes between 2.0.1 and 2.0.2: ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding th and mr to language list
vlc/vlc-2.0 | branch: master | Christoph Miebach | Mon Jul 16 15:15:34 2012 +0200| [1051ebf4c3b0f09006be3622297411f9ebaa9542] | committer: Christoph Miebach Adding th and mr to language list > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=1051ebf4c3b0f09006be3622297411f9ebaa9542 --- src/libvlc-module.c |4 1 file changed, 4 insertions(+) diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 648c148..3723f52 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -84,6 +84,7 @@ static const char *const ppsz_language[] = "ko", "lt", "mn", +"mr", "ms", "nb", "ne", @@ -102,6 +103,7 @@ static const char *const ppsz_language[] = "sr", "sv", "te", +"th", "tr", "uk", "vi", @@ -149,6 +151,7 @@ static const char *const ppsz_language_text[] = "한국어", "lietuvių", "Монгол хэл", +"मराठी", "Melayu", "Bokmål", "नेपाली", @@ -167,6 +170,7 @@ static const char *const ppsz_language_text[] = "српски", "Svenska", "తెలుగు", +"ภาษาไทย", "Türkçe", "украї́нська мо́ва", "tiếng Việt", ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Updated AUTHORS from git log
vlc/vlc-2.0 | branch: master | Christoph Miebach | Fri Jul 13 13:54:26 2012 +0200| [e5025ec9eba24b81d8fcebd8ae52e7edea9af293] | committer: Christoph Miebach Updated AUTHORS from git log > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e5025ec9eba24b81d8fcebd8ae52e7edea9af293 --- AUTHORS | 69 +++ 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/AUTHORS b/AUTHORS index 968f577..65938a9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -31,13 +31,14 @@ François Cartegnie Olivier Aubert Jakob Leben Benjamin Pracht -Jean-Philippe André Pavlov Konstantin -Steve Lhomme +Jean-Philippe André Hugo Beauzée-Luyssen +Steve Lhomme Stéphane Borel JP Dinger Geoffroy Couprie +David Fuhrmann Marian Ďurkovič Yoann Peronneau Jon Lech Johansen @@ -47,9 +48,8 @@ Jérôme Decoodt Faustino Osuna Loïc Minier KO Myung-Hun -David Flynn -David Fuhrmann Ludovic Fauvet +David Flynn Mark Moriarty Fabio Ritrovato Tony Castley @@ -64,19 +64,19 @@ Martin Storsjö Simon Latapie Bernie Purcell Henri Fallon +Denis Charmet Emmanuel Puig Sebastien Zwickert Adrien Maglo -Denis Charmet Renaud Dartus Alexis de Lattre +Edward Wang Vincent Penquerc'h Arnaud de Bossoreille de Ribou Mohammed Adnène Trojette Boris Dorès Jai Menon Anil Daoud -Edward Wang Pierre Baillet Daniel Mierswa Dominique Leuenberger @@ -88,38 +88,33 @@ Anthony Loiseau Lukas Durfina Xavier Marchesini Cyril Mathé +Éric Lassauge Juha Jeronen Juho Vähä-Herttua Ken Self -Dean Lee Richard Hosking -Éric Lassauge Alexis Ballier +Fumio Nakayama Marc Ariberti Benoit Steiner Michel Lespinasse -Vincenzo Reale Carlo Calabrò +Damien Erambert +Naohiro Koriyama Nicolas Chauvet Cheng Sun -Fumio Nakayama +Christoph Miebach Alexey Sokolov Basos G Brad Smith -Marián Hikaník -Michał Trzebiatowski -Mihkel Kirjutas -Naohiro Koriyama Philippe Morin +Tobias Güntner Vicente Jimenez Aguilar Yuval Tze Brendon Justin -Sidney Doria -Tobias Güntner Yves Duret -Gonçalo Cordeiro +Frédéric Yhuel Michael Hanselmann -Damien Erambert Damien Lucas Richard Shepherd Sébastien Toque @@ -130,7 +125,6 @@ Adrien Grand Colin Guthrie David Menestrina Dominique Martinet -Frédéric Yhuel Jason Luka Luc Saillard Mindaugas Baranauskas @@ -140,10 +134,8 @@ Steinar H. Gunderson Alexander Law Can Wu Christophe Courtaut -Gaëtan Rousseaux Hannes Domani Manol Manolov -A S Alam Antoine Lejeune Arnaud Schauly Branko Kokanovic @@ -152,7 +144,6 @@ Florian G. Pflug G Finch Keary Griffin Konstanty Bialkowski -Myckel Habets Przemyslaw Fiala Tanguy Krotoff Benjamin Drung @@ -168,27 +159,25 @@ Søren Bøg Toralf Niebuhr Austin Burrow Bill C. Riemers -Christoph Miebach +Casian Andrei +Chris Smowton Colin Delacroix Cristian Maglie Elminster2031 Fabian Keil -Gabor Kelemen Jakub Wieczorek -Khoem Sokhem +John Peterson Martin Briza Mike Houben Romain Goyet +Adrian Yanes +Arai/Fujisawa Tooru Aurélien Nephtali Barry Wardell Ben Hutchings Besnard Jean-Baptiste Brian Weaver -Casian Andrei Clement Chesnin -Eirik U. Birkeland -FUJISAWA Tooru -Jamil Ahmed Jonathan Rosser Joris van Rooij Kaloyan Kovachev @@ -200,12 +189,11 @@ Michael Feurstein Miguel Angel Cabrera Moya Ming Hu Niles Bindel -Otto Kekäläinen Pauline Castets +Rui Zhang Scott Caudle Simon Hailes Xavier Martin -Adrian Yanes Alex Converse Alexander Bethke Andres Krapf @@ -215,7 +203,6 @@ Anuradha Suraparaju Benjamin Poulain Brieuc Jeunhomme Chris Clayton -Chris Smowton Christopher Mueller Cédric Cocquebert Danny Wood @@ -233,6 +220,7 @@ Kai Lauterbach Konstantin Bogdanov Kuan-Chung Chiu Mark Hassman +Mark Lee Matthias Dahl Michael McEll Michael Ploujnikov @@ -244,6 +232,7 @@ Ron Frederick Ronald Wright Rov Juvano Sabourin Gilles +Sam Lade Sasha Koruga Sreng Jean Sven Petai @@ -287,7 +276,6 @@ Dan Rosenberg Daniel Dreibrodt Daniel Marth Daniel Tisza -David Planella Detlef Schroeder Diego Fernando Nieto Dominic Spitaler @@ -301,9 +289,9 @@ Fargier Sylvain Fathi Boudra Felix Geyer Filipe Azevedo -Florian Hubold Frank Enderle François Revol +Frode Tennebø Frédéric Crozat Gaurav Narula Georg Seifert @@ -323,6 +311,7 @@ Jarmo Torvinen Jason Scheunemann Jeff Lu Jeroen Ost +Joe Taber Johann Ransay Johannes Weißl John Hendrikx @@ -333,6 +322,7 @@ Julien / Gellule Julien Humbert Kamil Baldyga Kamil Klimek +Karlheinz Wohlmuth Kelly Anderson Kevin DuBois Lari Natri @@ -341,7 +331,6 @@ Lucas C. Villa Real Lukáš Lalinský Mal Graty Malte Tancred -Mark Lee Martin Pöhlmann Marton Balint Mathew King @@ -358,16 +347,15 @@ Nick Pope Peter Bak Nielsen Phil Roffe and David Grellscheid Pierre Souchay +Piotr Fusik Pádraig Brady R.M Ralph Giles -Ricardo Pérez López Robert Jedrzejczyk Robert Paciorek Rolf Ahrenberg Roman Pen Ruud Althuizen -Sam Lade Samuli Suominen Scott Lyons Sebastian Birk @@ -387,7 +375,6 @@ Tristan Heaven Yannick Bréhon Yavor Doganov Yohann Marti
[vlc-commits] macosx: fixed crash when opening DVDs with uncommon disk names (close #7146 )
vlc/vlc-2.0 | branch: master | Felix Paul Kühne | Sun
Jul 15 19:39:08 2012 +0200| [87a9a0ba2cc6f7fbe7f2117892a27b2c000c1a56] |
committer: Christoph Miebach
macosx: fixed crash when opening DVDs with uncommon disk names (close #7146)
(cherry picked from commit 68889de9bd2481b86c44e4d4150bbad19ffd5416)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=87a9a0ba2cc6f7fbe7f2117892a27b2c000c1a56
---
modules/gui/macosx/open.m | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 576c800..028703a 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -708,13 +708,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
GetVolParmsInfoBuffer volumeParms;
err = FSGetVolumeParms( actualVolume, &volumeParms, sizeof(volumeParms) );
-if ( noErr != err ) {
-msg_Err( p_intf, "error retrieving volume params, bailing out" );
-return @"";
+if ( noErr == err )
+{
+NSString *bsdName = [NSString stringWithUTF8String:(char
*)volumeParms.vMDeviceID];
+return [NSString stringWithFormat:@"/dev/r%@", bsdName];
}
-NSString *bsdName = [NSString stringWithUTF8String:(char
*)volumeParms.vMDeviceID];
-return [NSString stringWithFormat:@"/dev/r%@", bsdName];
+return @"";
}
- (char *)getVolumeTypeFromMountPath:(NSString *)mountPath
@@ -776,7 +776,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
BOOL isDir;
if ([fm fileExistsAtPath:fullPath isDirectory:&isDir] &&
isDir)
-{
+{
if ([currentFile caseInsensitiveCompare:@"SVCD"] ==
NSOrderedSame)
{
returnValue = kVLCMediaSVCD;
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] http: cosmetic
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Thu Jul
12 17:13:34 2012 +0300| [263c19e68dda632af184e415869a1b36871a42b0] | committer:
Christoph Miebach
http: cosmetic
(cherry picked from commit 43d5697733f19ae966de45fb1eb6b0b5589c6442)
Signed-off-by: Jean-Baptiste Kempf
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=263c19e68dda632af184e415869a1b36871a42b0
---
modules/access/http.c |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/access/http.c b/modules/access/http.c
index 9817bca..7c1ca8a 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -1257,14 +1257,12 @@ static int Request( access_t *p_access, uint64_t i_tell
)
net_Printf( p_access, p_sys->fd, pvs, "Host: %s\r\n",
p_sys->url.psz_host );
/* User Agent */
-net_Printf( p_access, p_sys->fd, pvs,
-"User-Agent: %s\r\n",
+net_Printf( p_access, p_sys->fd, pvs, "User-Agent: %s\r\n",
p_sys->psz_user_agent );
/* Referrer */
if (p_sys->psz_referrer)
{
-net_Printf( p_access, p_sys->fd, pvs,
-"Referer: %s\r\n",
+net_Printf( p_access, p_sys->fd, pvs, "Referer: %s\r\n",
p_sys->psz_referrer);
}
/* Offset */
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] http: write GET line in one go
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Thu Jul 12 17:15:40 2012 +0300| [ad6cb29b5df1d5bc536dbd1737abe47cbd546c1d] | committer: Christoph Miebach http: write GET line in one go This can save on TCP packet if Nagle somehow fails, and work around bugs in some broken HTTP servers. (cherry picked from commit 1924e5e81dcdb226e67933c54a48cba7f910d4bb) Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ad6cb29b5df1d5bc536dbd1737abe47cbd546c1d --- modules/access/http.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/access/http.c b/modules/access/http.c index 7c1ca8a..ffbffd7 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -1244,12 +1244,13 @@ static int Request( access_t *p_access, uint64_t i_tell ) const char *psz_path = p_sys->url.psz_path; if( !psz_path || !*psz_path ) psz_path = "/"; -net_Write( p_access, p_sys->fd, pvs, "GET ", 4 ); if( p_sys->b_proxy && pvs == NULL ) -net_Printf( p_access, p_sys->fd, NULL, "http://%s:%d";, -p_sys->url.psz_host, p_sys->url.i_port ); -net_Printf( p_access, p_sys->fd, pvs, "%s HTTP/1.%d\r\n", -psz_path, p_sys->i_version ); +net_Printf( p_access, p_sys->fd, NULL, +"GET http://%s:%d HTTP/1.%d\r\n", +p_sys->url.psz_host, p_sys->url.i_port, p_sys->i_version ); +else +net_Printf( p_access, p_sys->fd, pvs, "GET %s HTTP/1.%d\r\n", +psz_path, p_sys->i_version ); if( p_sys->url.i_port != (pvs ? 443 : 80) ) net_Printf( p_access, p_sys->fd, pvs, "Host: %s:%d\r\n", p_sys->url.psz_host, p_sys->url.i_port ); ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Hindi
vlc/vlc-2.0 | branch: master | Chandan Kumar | Thu Jul 12 22:22:59 2012 +0200| [ab3cbd4bba6188233e463bf86deeb1f9e4b775c0] | committer: Christoph Miebach l10n: Hindi Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ab3cbd4bba6188233e463bf86deeb1f9e4b775c0 --- po/hi.po | 6842 +++--- 1 file changed, 2555 insertions(+), 4287 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=ab3cbd4bba6188233e463bf86deeb1f9e4b775c0 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Language list: adding be and br, resort for lang code
vlc/vlc-2.0 | branch: master | Christoph Miebach |
Thu Jul 12 23:37:34 2012 +0200| [e9817969c7d9b635f148922eea51a0b32b1b2651] |
committer: Christoph Miebach
Language list: adding be and br, resort for lang code
Signed-off-by: Christoph Miebach
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e9817969c7d9b635f148922eea51a0b32b1b2651
---
src/libvlc-module.c | 80 +++
1 file changed, 42 insertions(+), 38 deletions(-)
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 7a012f4..648c148 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -50,62 +50,64 @@ static const char *const ppsz_language[] =
"auto",
"en",
"ar",
-"bn",
-"pt_BR",
-"en_GB",
-"el",
+"be",
"bg",
+"bn",
+"br",
"ca",
-"zh_TW",
+"ckb",
"cs",
"da",
-"nl",
-"fi",
+"de",
+"el",
+"en_GB",
+"es",
"et",
"eu",
+"fa",
+"fi",
"fr",
"ga",
"gd",
"gl",
-"ka",
-"de",
"he",
"hr",
"hu",
"hy",
-"is",
"id",
+"is",
"it",
"ja",
+"ka",
+"kk",
+"km",
"ko",
"lt",
"mn",
"ms",
"nb",
-"nn",
-"kk",
-"km",
"ne",
+"nl",
+"nn",
"oc",
-"fa",
+"pa",
"pl",
+"pt_BR",
"pt_PT",
-"pa",
"ro",
"ru",
-"zh_CN",
"si",
-"sr",
"sk",
"sl",
-"ckb",
-"es",
+"sr",
"sv",
"te",
"tr",
"uk",
"vi",
"wa",
+"zh_CN",
+"zh_TW",
};
static const char *const ppsz_language_text[] =
@@ -113,62 +115,64 @@ static const char *const ppsz_language_text[] =
N_("Auto"),
"American English",
"ﻉﺮﺒﻳ",
-"বাংলা",
-"Português Brasileiro",
-"British English",
-"Νέα Ελληνικά",
+"Беларуская",
"български език",
+"বাংলা",
+"Brezhoneg",
"Català",
-"正體中文",
+"کوردیی سۆرانی",
"Čeština",
"Dansk",
-"Nederlands",
-"Suomi",
+"Deutsch",
+"Νέα Ελληνικά",
+"British English",
+"Español",
"eesti keel",
"Euskara",
+"ﻑﺍﺮﺳی",
+"Suomi",
"Français",
"Gaeilge",
"Gàidhlig",
"Galego",
-"ქართული",
-"Deutsch",
"עברית",
"hrvatski",
"Magyar",
"հայերեն",
-"íslenska",
"Bahasa Indonesia",
+"íslenska",
"Italiano",
"日本語",
+"ქართული",
+"Қазақ тілі",
+"ភាសាខ្មែរ",
"한국어",
"lietuvių",
"Монгол хэл",
"Melayu",
"Bokmål",
-"Nynorsk",
-"Қазақ тілі",
-"ភាសាខ្មែរ",
"नेपाली",
+"Nederlands",
+"Nynorsk",
"Occitan",
-"ﻑﺍﺮﺳی",
+"ਪੰਜਾਬੀ",
"Polski",
+"Português Brasileiro",
"Português",
-"ਪੰਜਾਬੀ",
"Română",
"Русский",
-"简体中文",
"සිංහල",
-"српски",
"Slovensky",
"slovenščina",
-"کوردیی سۆرانی",
-"Español",
+"српски",
"Svenska",
"తెలుగు",
"Türkçe",
"украї́нська мо́ва",
"tiếng Việt",
"Walon",
+"简体中文",
+"正體中文",
};
#endif
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] AUTHORS add new translators
vlc/vlc-2.0 | branch: master | Christoph Miebach | Fri Jul 13 00:07:22 2012 +0200| [4871862ec6a22897625f1c700150a362ba8adf34] | committer: Christoph Miebach AUTHORS add new translators Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=4871862ec6a22897625f1c700150a362ba8adf34 --- AUTHORS |4 1 file changed, 4 insertions(+) diff --git a/AUTHORS b/AUTHORS index b51ecc0..968f577 100644 --- a/AUTHORS +++ b/AUTHORS @@ -604,6 +604,7 @@ Bayarsaikhan Enkhtaivan Баярсайхан Энхтайван - Mongolian Bruno Queirós - Portuguese Bruno Vella - Italian Carlo Calabrò - Italian +Chandan Kumar - Hindi Christoph Miebach - German Circo Radu - Romanian Cristian Secară - Romanian @@ -704,11 +705,14 @@ Said Marjan Zazai - Pashto Salar Khalilzadeh - Persian Sam Hocevar - British Samuel Hocevar - French +Sayan Chowdhury - Hindi Seanán Ó Coistín - Irish +Shashi Ranjan - Hindi Sidney Doria - Brazilian Portuguese Sigmund Augdal - Norwegian Simos Xenitellis - Greek Sipho Sibiya - Zulu +Sok Sophea - Khmer Solomon Gizaw - Amharic Sreejith P - Malayalam Sveinn í Felli - Icelandic ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] fr: typo (again)
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Thu Jul 12 18:37:17 2012 +0300| [8b9773ce15916355701b39602021c30e07a62b7d] | committer: Christoph Miebach fr: typo (again) (cherry picked from commit 314084ad1cbead060cb4d36f57c9441771ef9f31) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=8b9773ce15916355701b39602021c30e07a62b7d --- po/fr.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index a1df548..6cc4816 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2757,7 +2757,7 @@ msgstr "Vitesse de lecture" #: src/libvlc-module.c:785 msgid "This defines the playback speed (nominal speed is 1.0)." -msgstr "Ceci définit la vitesse de lexture (la vitesse nominale est 1.0)." +msgstr "Ceci définit la vitesse de lecture (la vitesse nominale est 1.0)." #: src/libvlc-module.c:787 msgid "Input list" ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] po: missing or incorrect language codes
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Thu Jul 12 18:47:06 2012 +0300| [65926ddf6f5e94fe0165773cee633a7e689d03d0] | committer: Christoph Miebach po: missing or incorrect language codes (cherry picked from commit 9181681e2dd7b9eeaaa3acf99c2f18b7862c9117) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=65926ddf6f5e94fe0165773cee633a7e689d03d0 --- po/ach.po |2 +- po/af.po |2 +- po/am.po |2 +- po/cgg.po |2 +- po/ff.po |2 +- po/lg.po |2 +- po/zu.po |2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/ach.po b/po/ach.po index ab9dacb..499cb8d 100644 --- a/po/ach.po +++ b/po/ach.po @@ -1330,7 +1330,7 @@ msgstr "" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "" +msgstr "ach" #: src/libvlc.c:864 msgid "" diff --git a/po/af.po b/po/af.po index 2e70c83..f864dcd 100644 --- a/po/af.po +++ b/po/af.po @@ -1326,7 +1326,7 @@ msgstr "Gebare" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "C" +msgstr "af" #: src/libvlc.c:864 msgid "" diff --git a/po/am.po b/po/am.po index 6de34bf..999322e 100644 --- a/po/am.po +++ b/po/am.po @@ -1328,7 +1328,7 @@ msgstr "" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "" +msgstr "am" #: src/libvlc.c:864 msgid "" diff --git a/po/cgg.po b/po/cgg.po index 8008a22..be94ec6 100644 --- a/po/cgg.po +++ b/po/cgg.po @@ -1318,7 +1318,7 @@ msgstr "" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "" +msgstr "cgg" #: src/libvlc.c:864 msgid "" diff --git a/po/ff.po b/po/ff.po index 622d252..54a46fc 100644 --- a/po/ff.po +++ b/po/ff.po @@ -1328,7 +1328,7 @@ msgstr "" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "" +msgstr "ff" #: src/libvlc.c:864 msgid "" diff --git a/po/lg.po b/po/lg.po index 37f84b8..cad2b9b 100644 --- a/po/lg.po +++ b/po/lg.po @@ -1329,7 +1329,7 @@ msgstr "" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "" +msgstr "lg" #: src/libvlc.c:864 msgid "" diff --git a/po/zu.po b/po/zu.po index 8ee5dee..33d953a 100644 --- a/po/zu.po +++ b/po/zu.po @@ -1329,7 +1329,7 @@ msgstr "" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "" +msgstr "zu" #: src/libvlc.c:864 msgid "" ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] nb: use consistent (if less precise) language code
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Thu Jul 12 18:49:14 2012 +0300| [c7c4fbbd15bf3d15f3626bb5b2531b39c61486cd] | committer: Christoph Miebach nb: use consistent (if less precise) language code (cherry picked from commit 7db7be8bd2e68d13470c92b6d92f2105aedd924b) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=c7c4fbbd15bf3d15f3626bb5b2531b39c61486cd --- po/nb.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb.po b/po/nb.po index cdeedd7..80fabfb 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1348,7 +1348,7 @@ msgstr "Musebevegelser" #. xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... #: src/libvlc.c:291 msgid "C" -msgstr "nb_NO" +msgstr "nb" #: src/libvlc.c:864 msgid "" ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Dutch update
vlc/vlc-2.0 | branch: master | Thomas De Rocker | Thu Jul 12 16:56:09 2012 +0200| [56e2863deaa11056b4ea2bd07674f9fe9a296248] | committer: Christoph Miebach l10n: Dutch update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=56e2863deaa11056b4ea2bd07674f9fe9a296248 --- po/nl.po | 61 ++--- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/po/nl.po b/po/nl.po index 1f0b9fb..521871b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: VLC Media Player\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2012-06-27 01:19+0200\n" -"PO-Revision-Date: 2012-05-27 09:24+0100\n" +"PO-Revision-Date: 2012-06-28 19:16+0100\n" "Last-Translator: Thomas De Rocker \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -621,7 +621,7 @@ msgstr "Geen herhaling" #: modules/gui/qt4/components/controller.hpp:118 #: modules/gui/qt4/components/controller.hpp:131 msgid "Random" -msgstr "Random" +msgstr "Willekeurige volgorde" #: include/vlc_intf_strings.h:85 modules/gui/macosx/CoreInteraction.m:403 msgid "Random Off" @@ -16211,7 +16211,6 @@ msgid "Use the native fullscreen mode on OS X Lion" msgstr "Standaard schermvullende modus gebruiken op OS X Lion" #: modules/gui/macosx/macosx.m:91 -#, fuzzy msgid "" "By default, VLC uses the fullscreen mode known from previous Mac OS X " "releases. It can also use the native fullscreen mode on Mac OS X 10.7 and " @@ -18707,7 +18706,7 @@ msgstr "Shift+L" #: modules/gui/qt4/components/controller.cpp:441 msgid "Click to toggle between loop all, loop one and no loop" msgstr "" -"Klik om te wisselen tussen Alles herhalen, één herhalen en niet herhalen" +"Klik om te schakelen tussen alles herhalen, één herhalen en niet herhalen" #: modules/gui/qt4/components/controller.cpp:532 msgid "Previous Chapter/Title" @@ -18723,7 +18722,7 @@ msgstr "Volgende hoofdstuk/titel" #: modules/gui/qt4/components/controller.cpp:577 msgid "Teletext Activation" -msgstr "Teletekst activatie" +msgstr "Teletext-activatie" #: modules/gui/qt4/components/controller.cpp:593 msgid "Toggle Transparency " @@ -18747,7 +18746,7 @@ msgstr "Volgende / Vooruit" #: modules/gui/qt4/components/controller.hpp:116 msgid "De-Fullscreen" -msgstr "De-schermvullend" +msgstr "Niet-schermvullend" #: modules/gui/qt4/components/controller.hpp:116 msgid "Extended panel" @@ -18877,7 +18876,7 @@ msgid "" "Loop from point A to point B continuously\n" "Click to set point A" msgstr "" -"Herhaal continue van punt A naar punt B\n" +"Continu van punt A naar B herhalen\n" "Klik om punt A in te stellen" #: modules/gui/qt4/components/controller_widget.cpp:255 @@ -18886,7 +18885,7 @@ msgstr "Klik om punt B in te stellen" #: modules/gui/qt4/components/controller_widget.cpp:260 msgid "Stop the A to B loop" -msgstr "Stop de A naar B lus" +msgstr "Stop het herhalen van A naar B" #: modules/gui/qt4/components/controller_widget.cpp:281 msgid "Aspect Ratio" @@ -19145,7 +19144,7 @@ msgstr ".*" #: modules/gui/qt4/components/open_panels.cpp:843 msgid "Use VLC pace" -msgstr "Gebruik VLC pace" +msgstr "VLC pace gebruiken" #: modules/gui/qt4/components/open_panels.cpp:847 msgid "Auto connection" @@ -19186,8 +19185,8 @@ msgstr "Bandbreedte" #: modules/gui/qt4/components/open_panels.cpp:1040 msgid "Your display will be opened and played in order to stream or save it." msgstr "" -"Uw weergave zal afgespeeld worden zodat het gestreamed of opgeslagen kan " -"worden." +"Uw weergave zal geopend en afgespeeld worden zodat het gestreamd of " +"opgeslagen kan worden." #. xgettext: frames per second #: modules/gui/qt4/components/open_panels.cpp:1054 @@ -19212,7 +19211,7 @@ msgstr "Zoeken in afspeellijst" #: modules/gui/qt4/components/playlist/playlist_model.cpp:53 msgid "Create Directory" -msgstr "Directory aanmaken" +msgstr "Map aanmaken" #: modules/gui/qt4/components/playlist/playlist_model.cpp:53 msgid "Create Folder" @@ -19220,7 +19219,7 @@ msgstr "Map aanmaken" #: modules/gui/qt4/components/playlist/playlist_model.cpp:55 msgid "Enter name for new directory:" -msgstr "Voer een naam in voor de nieuwe directory:" +msgstr "Voer een naam in voor de nieuwe map:" #: modules/gui/qt4/components/playlist/playlist_model.cpp:56 msgid "Enter name for new folder:" @@ -19240,11 +19239,11 @@ msgstr "Sorteren op" #: modules/gui/qt4/components/playlist/playlist_model.cpp:997 msgid "Ascending" -msgstr "Aflopend" +msgstr "Oplopend" #: modules/gui/qt4/components/playlist/playlist_model.cpp:998 msgid "Descending" -msgstr "Oplopend" +msgstr "Aflopend" #: modules/gui/qt4/components/playlist/playlist_model.cpp:1009 msgid "Display size" @@ -19288,7 +19287,7 @@ msgstr "Abonneren" #: modules/gui/qt4/components/playlist/selector.cpp:485 msgid "Enter URL of the podcast to subscribe to:" -msgstr "Geef de URL van een podcast waarop u
[vlc-commits] fr: two types in one line
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Thu Jul 12 18:35:03 2012 +0300| [37ea53b17224a181163c0d1889537f515094a7af] | committer: Christoph Miebach fr: two types in one line This is the second time this commit is applied. Consider this is the last warning for French translation. Any new revert of my corrections without explanation will be re-reverted without further notice. (cherry picked from commit 01c41858a7fbd7d19fb9a69fe137e3e7ac088437) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=37ea53b17224a181163c0d1889537f515094a7af --- po/fr.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index a74ed8a..a1df548 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8061,7 +8061,7 @@ msgstr "La session a échoué" #: modules/access/rtsp/access.c:229 msgid "The requested RTSP session could not be established." -msgstr "La sesion TRSP demandée n'a pu être établie." +msgstr "La session RTSP demandée n'a pu être établie." #: modules/access/screen/screen.c:43 #: modules/gui/qt4/components/open_panels.cpp:1046 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Slovenian update
vlc/vlc-2.0 | branch: master | Matej Urbančič | Thu Jul 12 16:17:16 2012 +0200| [685a0341641dbd5d714af8db549a35c74e35e377] | committer: Christoph Miebach l10n: Slovenian update > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=685a0341641dbd5d714af8db549a35c74e35e377 --- po/sl.po | 7214 +- 1 file changed, 3319 insertions(+), 3895 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=685a0341641dbd5d714af8db549a35c74e35e377 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Breton update
vlc/vlc-2.0 | branch: master | Denis ARNAUD | Thu Jul 12 16:38:46 2012 +0200| [ca2ef3326fbb7388a9713c5e8eb4e36be586c790] | committer: Christoph Miebach l10n: Breton update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ca2ef3326fbb7388a9713c5e8eb4e36be586c790 --- po/br.po | 137 ++ 1 file changed, 67 insertions(+), 70 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=ca2ef3326fbb7388a9713c5e8eb4e36be586c790 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Add Uzbek to LINGUAS, update AUTHORS
vlc/vlc-2.0 | branch: master | Christoph Miebach | Thu Jul 12 15:51:58 2012 +0200| [510b4eddb6a17bbc2f8c68608d084aedbb711cd6] | committer: Christoph Miebach l10n: Add Uzbek to LINGUAS, update AUTHORS > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=510b4eddb6a17bbc2f8c68608d084aedbb711cd6 --- AUTHORS|1 + po/LINGUAS |1 + 2 files changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 5f4894d..b51ecc0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -719,6 +719,7 @@ Thomas De Rocker - Dutch Thomas Graf - gettext support, German Tomáš Chvátal - Czech Tòni Galhard - Occitan +Umidjon Almasov - Uzbek Václav Pavlíček - Czech Valek Filippov - Russian Vicente Jimenez Aguilar - Spanish diff --git a/po/LINGUAS b/po/LINGUAS index c31f1d5..64af50f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -76,6 +76,7 @@ th tl tr uk +uz vi wa zh_CN ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Simplified Chinese update
vlc/vlc-2.0 | branch: master | Dean Lee | Thu Jul 12 15:10:53 2012 +0200| [f302c944dd74b53eac24fd005d01cca3fffd6079] | committer: Christoph Miebach l10n: Simplified Chinese update > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f302c944dd74b53eac24fd005d01cca3fffd6079 --- po/zh_CN.po | 1936 --- 1 file changed, 1304 insertions(+), 632 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=f302c944dd74b53eac24fd005d01cca3fffd6079 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Initial Uzbek translation
vlc/vlc-2.0 | branch: master | Umidjon Almasov | Thu Jul 12 15:27:40 2012 +0200| [4244c0073bfb9ae353303ae60f1311198c4856c2] | committer: Christoph Miebach l10n: Initial Uzbek translation > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=4244c0073bfb9ae353303ae60f1311198c4856c2 --- po/uz.po |26248 ++ 1 file changed, 26248 insertions(+) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=4244c0073bfb9ae353303ae60f1311198c4856c2 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Polish update
vlc/vlc-2.0 | branch: master | Michał Trzebiatowski | Thu Jul 12 15:02:33 2012 +0200| [9e136cc9d0c8f53a05ba76c43d5eb0f62f93c94d] | committer: Christoph Miebach l10n: Polish update > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=9e136cc9d0c8f53a05ba76c43d5eb0f62f93c94d --- po/pl.po | 1864 +- 1 file changed, 1227 insertions(+), 637 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=9e136cc9d0c8f53a05ba76c43d5eb0f62f93c94d ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Turkish update
vlc/vlc-2.0 | branch: master | Kaya Zeren | Thu Jul 12 15:07:19 2012 +0200| [da73b38883262f038bf7597a456e7cfc5cf2dedd] | committer: Christoph Miebach l10n: Turkish update > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=da73b38883262f038bf7597a456e7cfc5cf2dedd --- po/tr.po | 2760 +++--- 1 file changed, 1720 insertions(+), 1040 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=da73b38883262f038bf7597a456e7cfc5cf2dedd ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Initial Marathi translation
vlc/vlc-2.0 | branch: master | Rajnikant Kumbhar | Wed Jul 18 12:22:03 2012 +0200| [633da384e12984e189028c2daaf07e868afb3b1a] | committer: Christoph Miebach l10n: Initial Marathi translation Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=633da384e12984e189028c2daaf07e868afb3b1a --- po/mr.po |26238 ++ 1 file changed, 26238 insertions(+) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=633da384e12984e189028c2daaf07e868afb3b1a ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Add Marathi to LINGUAS, update AUTHORS
vlc/vlc-2.0 | branch: master | Christoph Miebach | Wed Jul 18 12:27:14 2012 +0200| [a5c08a867a33cd5b6c112a34637bbc26a9b079c9] | committer: Christoph Miebach l10n: Add Marathi to LINGUAS, update AUTHORS > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a5c08a867a33cd5b6c112a34637bbc26a9b079c9 --- AUTHORS|3 ++- po/LINGUAS |1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index b487177..5f4894d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -676,7 +676,7 @@ Mathias C. Berens, welcome-soft - German Mattias Põldaru - Estonian Md. Rezwan Shahid - Bengali Meelad Zakaria - Persian -Michael Bauer - Gaelic +Michael Bauer - Gaelic (Scottish) Michał Trzebiatowski - Polish Mihkel Kirjutas - Estonian Mindaugas Baranauskas - Lithuanian @@ -697,6 +697,7 @@ Philipp Weissenbacher - German Pittayakom Saingtong - Thai Praveen Illa - Telugu Predrag Ljubenović - Serbian +Rajnikant Kumbhar - Marathi Roustam Ghizdatov - Russian Sadia Afroz - Bengali Said Marjan Zazai - Pashto diff --git a/po/LINGUAS b/po/LINGUAS index 1cf9cd4..c31f1d5 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -48,6 +48,7 @@ lv ml mk mn +mr ms my nb ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
