[vlc-commits] DVDread: avoid crashes over invalid cell_playback_offset values

2013-02-26 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Tue Feb 26 
11:37:36 2013 +0100| [0019260703fb38b15403e8c41c6110d9c79a36f1] | committer: 
Jean-Baptiste Kempf

DVDread: avoid crashes over invalid cell_playback_offset values

Ref #8125

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

 modules/access/dvdread.c |8 
 1 file changed, 8 insertions(+)

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 93c3c29..79d8304 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -755,6 +755,12 @@ static int DvdReadSetArea( demux_t *p_demux, int i_title, 
int i_chapter,
 pgn = p_vts-vts_ptt_srpt-title[p_sys-i_ttn - 1].ptt[0].pgn;
 p_pgc = p_vts-vts_pgcit-pgci_srp[pgc_id - 1].pgc;
 
+if( p_pgc-cell_playback == NULL )
+{
+msg_Err( p_demux, Invalid PGC (cell_playback_offset) );
+return VLC_EGENERIC;
+}
+
 p_sys-i_title_start_cell =
 i_start_cell = p_pgc-program_map[pgn - 1] - 1;
 p_sys-i_title_start_block =
@@ -999,6 +1005,8 @@ static int DvdReadSetArea( demux_t *p_demux, int i_title, 
int i_chapter,
   p_sys-i_ttn - 1].ptt[i_chapter].pgn;
 
 p_pgc = p_vts-vts_pgcit-pgci_srp[pgc_id - 1].pgc;
+if( p_pgc-cell_playback == NULL )
+return VLC_EGENERIC; /* Couldn't set chapter */
 
 p_sys-i_cur_cell = p_pgc-program_map[pgn - 1] - 1;
 p_sys-i_chapter = i_chapter;

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

[vlc-commits] omxil: Ignore all secure/DRM codecs

2013-02-26 Thread Martin Storsjö 
vlc | branch: master | Martin Storsjö mar...@martin.st | Tue Feb 26 12:52:32 
2013 +0200| [03d6a4e29246a978a073a398d6ab8642d733ea1f] | committer: Martin 
Storsjö

omxil: Ignore all secure/DRM codecs

We can't use any of them since they don't output plain YUV data
but require using direct rendering.

This simplifies the condition and possibly also catches other cases
where it would be needed.

The case where it was added was for a device where the codec ending
with .secure was listed before the normal one. This kind of codec
is available on many other devices as well, but they're normally listed
only after the normal ones so we never pick them.

Signed-off-by: Martin Storsjö mar...@martin.st

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

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

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 8f35c6c..832582f 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -993,8 +993,9 @@ loaded:
  * has got a working OMX.qcom.video.decoder.avc instead though. */
 if (!strncmp(p_sys-ppsz_components[i], OMX.ARICENT., 12))
 continue;
-/* Some nVidia codec with DRM */
-if (!strncmp(p_sys-ppsz_components[i], 
OMX.Nvidia.h264.decode.secure, 29))
+/* Codecs with DRM, that don't output plain YUV data but only
+ * support direct rendering where the output can't be intercepted. */
+if (strstr(p_sys-ppsz_components[i], .secure))
 continue;
 /* Use VC1 decoder for WMV3 for now */
 if (!strcmp(p_sys-ppsz_components[i], OMX.SEC.WMV.Decoder))

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

[vlc-commits] Qt: soutmrl: fix transcode filters enumeration (fix #8219)

2013-02-26 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie fcvlc...@free.fr | Tue Feb 26 
17:05:29 2013 +0100| [639c139eeb151686c8dd04fa2814906019aed6aa] | committer: 
Francois Cartegnie

Qt: soutmrl: fix transcode filters enumeration (fix #8219)

According to documentation, must be colon separated instead of commas.
Also removes list enclosure.

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

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

diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp 
b/modules/gui/qt4/components/sout/profile_selector.cpp
index 88ce767..4b79d61 100644
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@ -251,7 +251,7 @@ void VLCProfileSelector::updateOptions( int i )
 if ( !value.isEmpty() )
 {
 QStringList valuesList = QUrl::fromPercentEncoding( 
value.toAscii() ).split( ; );
-smrl.option( vfilter, QString({%1}).arg( valuesList.join( 
, ) ) );
+smrl.option( vfilter, valuesList.join( : ) );
 }
 
 /*if ( codec is h264 )*/
@@ -317,7 +317,7 @@ void VLCProfileSelector::updateOptions( int i )
 if ( !value.isEmpty() )
 {
 QStringList valuesList = QUrl::fromPercentEncoding( 
value.toAscii() ).split( ; );
-smrl.option( afilter, QString({%1}).arg( valuesList.join( 
, ) ) );
+smrl.option( afilter, valuesList.join( : ) );
 }
 
 } else {

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

[vlc-commits] screen/mac: cursor rendering

2013-02-26 Thread arai 
vlc | branch: master | arai ara...@mac.com | Tue Feb 26 21:28:41 2013 +0900| 
[3f39f4163498762a6b45cef1cb44658b7813ade4] | committer: Felix Paul Kühne

screen/mac: cursor rendering

Signed-off-by: Felix Paul Kühne fkue...@videolan.org

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

 modules/access/screen/mac.c |  146 +--
 1 file changed, 71 insertions(+), 75 deletions(-)

diff --git a/modules/access/screen/mac.c b/modules/access/screen/mac.c
index 09dd7b1..698e362 100644
--- a/modules/access/screen/mac.c
+++ b/modules/access/screen/mac.c
@@ -56,6 +56,11 @@ struct screen_data_t
 int screen_height;
 
 CGDirectDisplayID display_id;
+
+CGContextRef offscreen_context;
+CGRect offscreen_rect;
+void *offscreen_bitmap;
+size_t offscreen_bitmap_size;
 };
 
 int screen_InitCapture(demux_t *p_demux)
@@ -63,7 +68,6 @@ int screen_InitCapture(demux_t *p_demux)
 demux_sys_t *p_sys = p_demux-p_sys;
 screen_data_t *p_data;
 CGLError returnedError;
-int i_bits_per_pixel, i_chroma = 0;
 
 p_sys-p_data = p_data = calloc(1, sizeof(screen_data_t));
 if (!p_data)
@@ -106,59 +110,17 @@ int screen_InitCapture(demux_t *p_demux)
 p_data-height = p_data-screen_height;
 }
 
-CFStringRef pixelEncoding = 
CGDisplayModeCopyPixelEncoding(CGDisplayCopyDisplayMode(p_data-display_id));
-int length = CFStringGetLength(pixelEncoding);
-length++;
-char *psz_name = (char *)malloc(length);
-CFStringGetCString(pixelEncoding, psz_name, length, kCFStringEncodingUTF8);
-msg_Dbg(p_demux, pixel encoding is '%s', psz_name);
-CFRelease(pixelEncoding);
-
-if (!strcmp(psz_name, IO32BitDirectPixels)) {
-i_chroma = VLC_CODEC_RGB32;
-i_bits_per_pixel = 32;
-} else if (!strcmp(psz_name, IO16BitDirectPixels)) {
-i_chroma = VLC_CODEC_RGB16;
-i_bits_per_pixel = 16;
-} else if (!strcmp(psz_name, IO8BitIndexedPixels)) {
-i_chroma = VLC_CODEC_RGB8;
-i_bits_per_pixel = 8;
-} else {
-msg_Err(p_demux, unsupported pixel encoding);
-free(p_data);
-return VLC_EGENERIC;
-}
-free(psz_name);
-
 /* setup format */
-es_format_Init(p_sys-fmt, VIDEO_ES, i_chroma);
+es_format_Init(p_sys-fmt, VIDEO_ES, VLC_CODEC_RGB32);
 p_sys-fmt.video.i_visible_width  =
 p_sys-fmt.video.i_width  = rect.size.width;
 p_sys-fmt.video.i_visible_height =
 p_sys-fmt.video.i_height = rect.size.height;
-p_sys-fmt.video.i_bits_per_pixel = i_bits_per_pixel;
-p_sys-fmt.video.i_chroma = i_chroma;
-
-switch (i_chroma) {
-case VLC_CODEC_RGB15:
-p_sys-fmt.video.i_rmask = 0x7c00;
-p_sys-fmt.video.i_gmask = 0x03e0;
-p_sys-fmt.video.i_bmask = 0x001f;
-break;
-case VLC_CODEC_RGB24:
-p_sys-fmt.video.i_rmask = 0x00ff;
-p_sys-fmt.video.i_gmask = 0xff00;
-p_sys-fmt.video.i_bmask = 0x00ff;
-break;
-case VLC_CODEC_RGB32:
-p_sys-fmt.video.i_rmask = 0x00ff;
-p_sys-fmt.video.i_gmask = 0xff00;
-p_sys-fmt.video.i_bmask = 0x00ff;
-break;
-default:
-msg_Warn( p_demux, Unknown RGB masks );
-break;
-}
+p_sys-fmt.video.i_bits_per_pixel = 32;
+p_sys-fmt.video.i_chroma = VLC_CODEC_RGB32;
+p_sys-fmt.video.i_rmask  = 0x00ff;
+p_sys-fmt.video.i_gmask  = 0xff00;
+p_sys-fmt.video.i_bmask  = 0x00ff;
 
 return VLC_SUCCESS;
 }
@@ -168,6 +130,12 @@ int screen_CloseCapture(demux_t *p_demux)
 demux_sys_t *p_sys = p_demux-p_sys;
 screen_data_t *p_data = p_sys-p_data;
 
+if (p_data-offscreen_context)
+CFRelease(p_data-offscreen_context);
+
+if (p_data-offscreen_bitmap)
+free(p_data-offscreen_bitmap);
+
 if (p_data-p_block)
 block_Release(p_data-p_block);
 
@@ -183,8 +151,6 @@ block_t *screen_Capture(demux_t *p_demux)
 block_t *p_block;
 CGRect capture_rect;
 CGImageRef image;
-CGDataProviderRef dataProvider;
-CFDataRef data;
 
 /* forward cursor location */
 CGPoint cursor_pos;
@@ -204,37 +170,67 @@ block_t *screen_Capture(demux_t *p_demux)
 capture_rect.size.width = p_data-width;
 capture_rect.size.height = p_data-height;
 
-#if 0
-// FIXME: actually plot cursor image into snapshot
-/* fetch cursor image */
-CGImageRef cursor_image;
-int cid = CGSMainConnectionID();
-CGPoint outHotSpot;
-cursor_image = CGSCreateRegisteredCursorImage(cid, (char 
*)com.apple.coregraphics.GlobalCurrent, outHotSpot);
-#endif
-
 /* fetch image data */
 image = CGDisplayCreateImageForRect(p_data-display_id, capture_rect);
-if (image) {
-/* build block */
-int i_buffer = (p_sys-fmt.video.i_bits_per_pixel + 7)

[vlc-commits] screen/mac: cursor rendering

2013-02-26 Thread FUJISAWA Tooru 
vlc | branch: master | FUJISAWA Tooru ara...@mac.com | Tue Feb 26 21:28:41 
2013 +0900| [89d1b53d2aed6046d22d6bf890750ea3e8000820] | committer: Felix Paul 
Kühne

screen/mac: cursor rendering

Signed-off-by: Felix Paul Kühne fkue...@videolan.org

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

 modules/access/screen/mac.c |  146 +--
 1 file changed, 71 insertions(+), 75 deletions(-)

diff --git a/modules/access/screen/mac.c b/modules/access/screen/mac.c
index 09dd7b1..698e362 100644
--- a/modules/access/screen/mac.c
+++ b/modules/access/screen/mac.c
@@ -56,6 +56,11 @@ struct screen_data_t
 int screen_height;
 
 CGDirectDisplayID display_id;
+
+CGContextRef offscreen_context;
+CGRect offscreen_rect;
+void *offscreen_bitmap;
+size_t offscreen_bitmap_size;
 };
 
 int screen_InitCapture(demux_t *p_demux)
@@ -63,7 +68,6 @@ int screen_InitCapture(demux_t *p_demux)
 demux_sys_t *p_sys = p_demux-p_sys;
 screen_data_t *p_data;
 CGLError returnedError;
-int i_bits_per_pixel, i_chroma = 0;
 
 p_sys-p_data = p_data = calloc(1, sizeof(screen_data_t));
 if (!p_data)
@@ -106,59 +110,17 @@ int screen_InitCapture(demux_t *p_demux)
 p_data-height = p_data-screen_height;
 }
 
-CFStringRef pixelEncoding = 
CGDisplayModeCopyPixelEncoding(CGDisplayCopyDisplayMode(p_data-display_id));
-int length = CFStringGetLength(pixelEncoding);
-length++;
-char *psz_name = (char *)malloc(length);
-CFStringGetCString(pixelEncoding, psz_name, length, kCFStringEncodingUTF8);
-msg_Dbg(p_demux, pixel encoding is '%s', psz_name);
-CFRelease(pixelEncoding);
-
-if (!strcmp(psz_name, IO32BitDirectPixels)) {
-i_chroma = VLC_CODEC_RGB32;
-i_bits_per_pixel = 32;
-} else if (!strcmp(psz_name, IO16BitDirectPixels)) {
-i_chroma = VLC_CODEC_RGB16;
-i_bits_per_pixel = 16;
-} else if (!strcmp(psz_name, IO8BitIndexedPixels)) {
-i_chroma = VLC_CODEC_RGB8;
-i_bits_per_pixel = 8;
-} else {
-msg_Err(p_demux, unsupported pixel encoding);
-free(p_data);
-return VLC_EGENERIC;
-}
-free(psz_name);
-
 /* setup format */
-es_format_Init(p_sys-fmt, VIDEO_ES, i_chroma);
+es_format_Init(p_sys-fmt, VIDEO_ES, VLC_CODEC_RGB32);
 p_sys-fmt.video.i_visible_width  =
 p_sys-fmt.video.i_width  = rect.size.width;
 p_sys-fmt.video.i_visible_height =
 p_sys-fmt.video.i_height = rect.size.height;
-p_sys-fmt.video.i_bits_per_pixel = i_bits_per_pixel;
-p_sys-fmt.video.i_chroma = i_chroma;
-
-switch (i_chroma) {
-case VLC_CODEC_RGB15:
-p_sys-fmt.video.i_rmask = 0x7c00;
-p_sys-fmt.video.i_gmask = 0x03e0;
-p_sys-fmt.video.i_bmask = 0x001f;
-break;
-case VLC_CODEC_RGB24:
-p_sys-fmt.video.i_rmask = 0x00ff;
-p_sys-fmt.video.i_gmask = 0xff00;
-p_sys-fmt.video.i_bmask = 0x00ff;
-break;
-case VLC_CODEC_RGB32:
-p_sys-fmt.video.i_rmask = 0x00ff;
-p_sys-fmt.video.i_gmask = 0xff00;
-p_sys-fmt.video.i_bmask = 0x00ff;
-break;
-default:
-msg_Warn( p_demux, Unknown RGB masks );
-break;
-}
+p_sys-fmt.video.i_bits_per_pixel = 32;
+p_sys-fmt.video.i_chroma = VLC_CODEC_RGB32;
+p_sys-fmt.video.i_rmask  = 0x00ff;
+p_sys-fmt.video.i_gmask  = 0xff00;
+p_sys-fmt.video.i_bmask  = 0x00ff;
 
 return VLC_SUCCESS;
 }
@@ -168,6 +130,12 @@ int screen_CloseCapture(demux_t *p_demux)
 demux_sys_t *p_sys = p_demux-p_sys;
 screen_data_t *p_data = p_sys-p_data;
 
+if (p_data-offscreen_context)
+CFRelease(p_data-offscreen_context);
+
+if (p_data-offscreen_bitmap)
+free(p_data-offscreen_bitmap);
+
 if (p_data-p_block)
 block_Release(p_data-p_block);
 
@@ -183,8 +151,6 @@ block_t *screen_Capture(demux_t *p_demux)
 block_t *p_block;
 CGRect capture_rect;
 CGImageRef image;
-CGDataProviderRef dataProvider;
-CFDataRef data;
 
 /* forward cursor location */
 CGPoint cursor_pos;
@@ -204,37 +170,67 @@ block_t *screen_Capture(demux_t *p_demux)
 capture_rect.size.width = p_data-width;
 capture_rect.size.height = p_data-height;
 
-#if 0
-// FIXME: actually plot cursor image into snapshot
-/* fetch cursor image */
-CGImageRef cursor_image;
-int cid = CGSMainConnectionID();
-CGPoint outHotSpot;
-cursor_image = CGSCreateRegisteredCursorImage(cid, (char 
*)com.apple.coregraphics.GlobalCurrent, outHotSpot);
-#endif
-
 /* fetch image data */
 image = CGDisplayCreateImageForRect(p_data-display_id, capture_rect);
-if (image) {
-/* build block */
-int i_buffer =

[vlc-commits] Info.plist: add support for dvdmedia packages, which are essentially Video_TS dumps for Apple's DVD Player.app

2013-02-26 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Tue Feb 26 
23:09:24 2013 +0100| [6a4cd277610ed2e2186a582ad8a6522db1da3f0f] | committer: 
Felix Paul Kühne

Info.plist: add support for dvdmedia packages, which are essentially Video_TS 
dumps for Apple's DVD Player.app

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

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

diff --git a/extras/package/macosx/Info.plist.in 
b/extras/package/macosx/Info.plist.in
index 9ed08df..51ce869 100644
--- a/extras/package/macosx/Info.plist.in
+++ b/extras/package/macosx/Info.plist.in
@@ -42,6 +42,20 @@
stringViewer/string
/dict
dict
+keyCFBundleTypeExtensions/key
+array
+stringdvdmedia/string
+/array
+keyCFBundleTypeIconFile/key
+stringmovie.icns/string
+keyCFBundleTypeName/key
+stringDVD Media Document/string
+keyCFBundleTypeRole/key
+stringEditor/string
+keyLSTypeIsPackage/key
+true/
+/dict
+   dict
keyCFBundleTypeExtensions/key
array
stringxspf/string

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

[vlc-commits] Info.plist: add support for dvdmedia packages, which are essentially Video_TS dumps for Apple's DVD Player.app

2013-02-26 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne fkue...@videolan.org | Tue 
Feb 26 23:09:24 2013 +0100| [37182a2adc7a6f9bfd9626cd9580a382b8ff6ac9] | 
committer: Felix Paul Kühne

Info.plist: add support for dvdmedia packages, which are essentially Video_TS 
dumps for Apple's DVD Player.app
(cherry picked from commit 6a4cd277610ed2e2186a582ad8a6522db1da3f0f)

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=37182a2adc7a6f9bfd9626cd9580a382b8ff6ac9
---

 NEWS|3 ++-
 extras/package/macosx/Info.plist.in |   14 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1ac4b6e..9c9bc6d 100644
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,8 @@ Mac OS X:
  * Fix crash within the video output code
  * Fix BDMV folder selection issue on OS X Mountain Lion, which treats such
folders as a AVCHD file as soon as they include an item named INDEX.BDM
- * Fix bug which caused a hidden fullscreen panel 
+ * Fix bug which caused a hidden fullscreen panel
+ * Allow VLC to be associated with .dvdmedia packages
 
 Qt:
  * Fix clearing of Media Info panel on dialog exit
diff --git a/extras/package/macosx/Info.plist.in 
b/extras/package/macosx/Info.plist.in
index 7408ebb..441b220 100644
--- a/extras/package/macosx/Info.plist.in
+++ b/extras/package/macosx/Info.plist.in
@@ -42,6 +42,20 @@
stringViewer/string
/dict
dict
+keyCFBundleTypeExtensions/key
+array
+stringdvdmedia/string
+/array
+keyCFBundleTypeIconFile/key
+stringmovie.icns/string
+keyCFBundleTypeName/key
+stringDVD Media Document/string
+keyCFBundleTypeRole/key
+stringEditor/string
+keyLSTypeIsPackage/key
+true/
+/dict
+   dict
keyCFBundleTypeExtensions/key
array
stringxspf/string

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

[vlc-commits] l10n: Estonian update

2013-02-26 Thread Ivar Smolin 
vlc/vlc-2.0 | branch: master | Ivar Smolin o...@linux.ee | Tue Feb 26 
22:56:55 2013 +0100| [041586d42ea59e3784f8329a7a348120354cfc14] | committer: 
Christoph Miebach

l10n: Estonian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=041586d42ea59e3784f8329a7a348120354cfc14
---

 po/et.po |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/po/et.po b/po/et.po
index a6500df..d9b0d27 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2012-12-11 15:41+0100\n
-PO-Revision-Date: 2013-01-21 06:50+\n
+PO-Revision-Date: 2013-02-10 06:50+\n
 Last-Translator: Ivar Smolin o...@linux.ee\n
 Language-Team: Estonian (http://www.transifex.com/projects/p/vlc-trans/;
 language/et/)\n
@@ -23477,8 +23477,8 @@ msgid 
 Value of the audio level of each channels between 0 and 1. Each level should 
 be separated with ':'.
 msgstr 
-Iga audio kanali helinivoo väärtus vahemikus 0 ja 1. Iga nivoo peaks olema 
-eraldatud ':'.
+Iga audiokanali helinivoo tase vahemikus 0 ja 1. Nivood eraldatakse 
+üksteisest kooloniga.
 
 #: modules/video_filter/audiobargraph_v.c:51
 msgid X coordinate of the bargraph.
@@ -23518,6 +23518,8 @@ msgstr Alarm
 #: modules/video_filter/audiobargraph_v.c:63
 msgid Signals a silence and displays and alert (0=no alarm, 1=alarm).
 msgstr 
+Vaikuse kohta märguande kuvamine (0=märguannet ei kuvata, 1=märguannet 
+kuvatakse).
 
 #: modules/video_filter/audiobargraph_v.c:65
 msgid Bar width in pixel (default : 10)
@@ -26329,7 +26331,7 @@ msgstr Videoefektide akna kõrgus pikslites.
 
 #: modules/visualization/visual/visual.c:56
 msgid Show 80 bands instead of 20
-msgstr Kuva 80 sagedust 20 asemel
+msgstr 80 sageduse näitamine 20 asemel
 
 #: modules/visualization/visual/visual.c:58
 msgid More bands for the spectrometer : 80 if enabled else 20.
@@ -26349,7 +26351,7 @@ msgstr See koefitsent muudab sageduste kõrgust.
 
 #: modules/visualization/visual/visual.c:66
 msgid Draw peaks in the analyzer
-msgstr Joonista \tipud\ analüsaatoril.
+msgstr Analüsaatorile joonistatakse \tipud\ 
 
 #: modules/visualization/visual/visual.c:68
 msgid Enable original graphic spectrum
@@ -26389,7 +26391,7 @@ msgstr Tipu kõrgus
 
 #: modules/visualization/visual/visual.c:86
 msgid Total pixel height of the peak items.
-msgstr Pikslite tipu elementide kogukõrgus.
+msgstr Tipuelementide kogukõrgus pikslites.
 
 #: modules/visualization/visual/visual.c:88
 msgid Peak extra width

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

[vlc-commits] l10n: Bosnian update

2013-02-26 Thread Adnan Memija 
vlc/vlc-2.0 | branch: master | Adnan Memija sream...@live.com | Tue Feb 26 
22:39:26 2013 +0100| [7744d6859595d39ec47b5356c8a7cf0fcb1d0ff9] | committer: 
Christoph Miebach

l10n: Bosnian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=7744d6859595d39ec47b5356c8a7cf0fcb1d0ff9
---

 po/bs.po | 2048 +++---
 1 file changed, 1027 insertions(+), 1021 deletions(-)

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

[vlc-commits] l10n: Portuguese (Portugal) update

2013-02-26 Thread Bruno Miguel Queiros 
vlc/vlc-2.0 | branch: master | Bruno Miguel Queiros bquei...@gmail.com | Tue 
Feb 26 23:28:41 2013 +0100| [9700a7c76d626fbd958aa5106f7b2a5ec3e37f21] | 
committer: Christoph Miebach

l10n: Portuguese (Portugal) update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=9700a7c76d626fbd958aa5106f7b2a5ec3e37f21
---

 po/pt_PT.po | 1062 ++-
 1 file changed, 541 insertions(+), 521 deletions(-)

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

[vlc-commits] l10n: Russian update

2013-02-26 Thread Alexander Lakhin 
vlc/vlc-2.0 | branch: master | Alexander Lakhin exclus...@gmail.com | Tue Feb 
26 23:33:22 2013 +0100| [ca4bc8072ff84150414e48145ab0cae27475f159] | committer: 
Christoph Miebach

l10n: Russian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

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

 po/ru.po | 2730 +++---
 1 file changed, 1549 insertions(+), 1181 deletions(-)

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

[vlc-commits] l10n: Thai update

2013-02-26 Thread Thanakrit Chomphuming 
vlc/vlc-2.0 | branch: master | Thanakrit Chomphuming jerng...@gmail.com | Tue 
Feb 26 23:44:23 2013 +0100| [03c7c88f6ee32dd26d47e24df48bf0d7545b4c99] | 
committer: Christoph Miebach

l10n: Thai update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=03c7c88f6ee32dd26d47e24df48bf0d7545b4c99
---

 po/th.po |  479 +++---
 1 file changed, 243 insertions(+), 236 deletions(-)

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

[vlc-commits] l10n: Serbian update

2013-02-26 Thread Ђорђе Васиљевић 
vlc/vlc-2.0 | branch: master | Ђорђе Васиљевић theranchcow...@gmail.com | Tue 
Feb 26 23:41:40 2013 +0100| [beaff274956ef4399adf329dba9dfba4dc6e8f2f] | 
committer: Christoph Miebach

l10n: Serbian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

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

 po/sr.po |11749 +++---
 1 file changed, 5097 insertions(+), 6652 deletions(-)

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

[vlc-commits] l10n: German update

2013-02-26 Thread Mario Siegmann 
vlc/vlc-2.0 | branch: master | Mario Siegmann mario_siegm...@web.de | Tue Feb 
26 22:48:49 2013 +0100| [6317929331750719da2008f1e77dcb1a71a1d551] | committer: 
Christoph Miebach

l10n: German update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=6317929331750719da2008f1e77dcb1a71a1d551
---

 po/de.po |   56 ++--
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/po/de.po b/po/de.po
index 2d890c3..eb368ac 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,5 @@
 # German translation
-# Copyright (C) 2012 VideoLAN
+# Copyright (C) 2013 VideoLAN
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
@@ -7,19 +7,19 @@
 # Felix Kühne fkuehne at users.sf.net, 2003-2012, 2012.
 # Jens Seidel jensseidel _at_ users.sf.net, 2005.
 # Kai Hermann kai.uwe.herm...@gmail.com, 2009.
-# Mario Siegmann mario_siegm...@web.de, 2011-2012.
+# Mario Siegmann mario_siegm...@web.de, 2011-2013.
 # Mathias C. Berens | welcome-soft berens at welcome-soft.de, 2006.
 # Michał Trzebiatowski hippie_1...@hotmail.com, 2010,2012.
 # Philipp Weissenbacher philippweissenbacher _at_ aon.at, 2004.
 # Thomas Graf tgr at reeler.org, 2002.
-#: modules/gui/macosx/prefs.m:490 modules/gui/macosx/simple_prefs.m:451
+#
 msgid 
 msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2012-12-11 15:41+0100\n
-PO-Revision-Date: 2012-12-02 15:21+\n
-Last-Translator: Christoph Miebach christoph.mieb...@web.de\n
+PO-Revision-Date: 2013-02-08 12:43+\n
+Last-Translator: Mario Siegmann mario_siegm...@web.de\n
 Language-Team: German (http://www.transifex.com/projects/p/vlc-trans/;
 language/de/)\n
 Language: de\n
@@ -14296,7 +14296,7 @@ msgstr Auf Demuxer-Ebene decodieren
 
 #: modules/demux/image.c:56
 msgid Forced chroma
-msgstr Erzwungenes Chroma
+msgstr Farbsättigung erzwingen
 
 #: modules/demux/image.c:58
 msgid 
@@ -16547,7 +16547,7 @@ msgstr Hilfe
 
 #: modules/gui/macosx/MainMenu.m:354
 msgid VLC media player Help...
-msgstr VLC media player-Hilfe
+msgstr VLC media player Hilfe
 
 #: modules/gui/macosx/MainMenu.m:355
 msgid ReadMe / FAQ...
@@ -19788,8 +19788,8 @@ msgstr 
 Der VLC media player ist ein freier Medienplayer, Encodierer und Streamer, 
 der Dateien von DVDs und CDs, Netzwerkstreams, Aufnahmekarten und vielem 
 mehr lesen kann.\n
-VLC benutzt seine internen Codecs und funktioniert auf jeder populären 
-Plattform.\n
+Der VLC media player benutzt seine internen Codecs und funktioniert auf 
+jeder populären Plattform.\n
 \n
 
 #: modules/gui/qt4/dialogs/help.cpp:113
@@ -19834,7 +19834,7 @@ msgstr Nein
 
 #: modules/gui/qt4/dialogs/help.cpp:165 modules/gui/qt4/ui/update.h:148
 msgid VLC media player updates
-msgstr VLC media player-Updates
+msgstr VLC media player Updates
 
 #: modules/gui/qt4/dialogs/help.cpp:237
 msgid A new version of VLC (%1.%2.%3%4) is available.
@@ -20308,7 +20308,7 @@ msgstr VOD: 
 
 #: modules/gui/qt4/main_interface.cpp:1135
 msgid Control menu for the player
-msgstr Steuerungsmenü für den Player
+msgstr Steuerungsmenü für den VLC media player
 
 #: modules/gui/qt4/main_interface.cpp:1178
 msgid Paused
@@ -24403,7 +24403,7 @@ msgstr Farbsättigung des Überblendbildes
 
 #: modules/video_filter/blendbench.c:68
 msgid Chroma which the blend image will be loaded in
-msgstr Chroma in die das Einblendbild geladen wird
+msgstr Farbsättigung die in das Einblendbild geladen wird
 
 #: modules/video_filter/blendbench.c:74
 msgid Blending benchmark filter
@@ -24859,7 +24859,7 @@ msgstr Für Streaming benutzte Deinterlace-Methode.
 
 #: modules/video_filter/deinterlace/deinterlace.c:66
 msgid Phosphor chroma mode for 4:2:0 input
-msgstr Leuchtstoff-Chroma-Modus für den 4:2:0-Eingang
+msgstr Leuchtstoff-Farbsättigungs-Modus für den 4:2:0-Eingang
 
 #: modules/video_filter/deinterlace/deinterlace.c:67
 msgid 
@@ -27612,7 +27612,7 @@ msgstr 
 msgid 
 Volume will be controlled by the player, and not the iMain Controls/i.
 msgstr 
-Die Lautstärke wird durch den VLC-Player und nicht durch die iHaupt-
+Die Lautstärke wird durch den VLC media player und nicht durch die iHaupt-
 Bedienelemente/i kontrolliert.
 
 #: share/lua/http/index.html:272
@@ -28525,24 +28525,12 @@ msgstr Media Manager-Liste
 #~ Einige DVB-Karten vertragen das Testen ihrer Fähigkeiten nicht. Diese 
 #~ Funktionen deaktivieren, falls Probleme auftreten.
 
-#~ msgid Satellite scanning config
-#~ msgstr Konfiguration zur Satelliten-Suche
-
 #~ msgid filename of config file in share/dvb/dvb-s
 #~ msgstr Dateiname der Konfigurationsdatei unter share/dvb/dvb-s
 
-#~ msgid DVB
-#~ msgstr DVB
-
 #~ msgid DVB input with v4l2 support
 #~ msgstr DVB-Eingang mit v4l2 Unterstützung
 
-#~ msgid ARM NEON video chroma YUV-RGBA
-#~ msgstr ARM NEON Video-Farbsättigung YUV-RGBA
-
-#~ msgid Opus audio decoder
-#~ msgstr Opus Audio-Decoder
-
 #~ msgid Opus
 #~

[vlc-commits] l10n: Romanian update

2013-02-26 Thread Cristian Secară 
vlc/vlc-2.0 | branch: master | Cristian Secară cri...@secarica.ro | Wed Feb 
27 00:19:23 2013 +0100| [a029ed2ca97f5906995b24ae5936f426f4e6f54c] | committer: 
Christoph Miebach

l10n: Romanian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

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

 po/ro.po | 4934 --
 1 file changed, 967 insertions(+), 3967 deletions(-)

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

[vlc-commits] l10n: French update

2013-02-26 Thread Éric Lassauge 
vlc/vlc-2.0 | branch: master | Éric Lassauge lassa...@users.sourceforge.net | 
Wed Feb 27 00:38:20 2013 +0100| [3956c5390764799a7c0b32baa34ac9b7d04847f1] | 
committer: Christoph Miebach

l10n: French update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3956c5390764799a7c0b32baa34ac9b7d04847f1
---

 po/fr.po |12501 ++
 1 file changed, 3604 insertions(+), 8897 deletions(-)

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

[vlc-commits] screen: return correct time for DEMUX_GET_TIME

2013-02-26 Thread FUJISAWA Tooru 
vlc | branch: master | FUJISAWA Tooru ara...@mac.com | Wed Feb 27 01:10:14 
2013 +0900| [74a3b3f19f3f15843e913ce347c237eb23375f6f] | committer: Felix Paul 
Kühne

screen: return correct time for DEMUX_GET_TIME

Signed-off-by: Felix Paul Kühne fkue...@videolan.org

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

 modules/access/screen/screen.c |5 -
 modules/access/screen/screen.h |2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index db0601d..8340306 100644
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -235,6 +235,8 @@ static int Open( vlc_object_t *p_this )
 
 p_sys-es = es_out_Add( p_demux-out, p_sys-fmt );
 
+p_sys-i_start = mdate();
+
 return VLC_SUCCESS;
 }
 
@@ -293,6 +295,7 @@ static int Control( demux_t *p_demux, int i_query, va_list 
args )
 {
 bool *pb;
 int64_t *pi64;
+demux_sys_t *p_sys = p_demux-p_sys;
 
 switch( i_query )
 {
@@ -313,7 +316,7 @@ static int Control( demux_t *p_demux, int i_query, va_list 
args )
 
 case DEMUX_GET_TIME:
 pi64 = (int64_t*)va_arg( args, int64_t * );
-*pi64 = mdate();
+*pi64 = mdate() - p_sys-i_start;
 return VLC_SUCCESS;
 
 /* TODO implement others */
diff --git a/modules/access/screen/screen.h b/modules/access/screen/screen.h
index 61c2b2e..cd5fe3b 100644
--- a/modules/access/screen/screen.h
+++ b/modules/access/screen/screen.h
@@ -48,6 +48,8 @@ struct demux_sys_t
 mtime_t i_next_date;
 int i_incr;
 
+mtime_t i_start;
+
 #ifdef SCREEN_SUBSCREEN
 bool b_follow_mouse;
 unsigned int i_screen_height;

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