date:20180205

[vlc-commits] l10n: Add missing Blu-ray string to NSIS German translation

2018-02-05 Thread Marvin Scholz

vlc | branch: master | Marvin Scholz  | Mon Feb  5 23:07:02 
2018 +0100| [3c7c271842bc6b325eb8865688f77a014a8ce0ed] | committer: Marvin 
Scholz

l10n: Add missing Blu-ray string to NSIS German translation

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

 extras/package/win32/NSIS/languages/GermanExtra.nsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/win32/NSIS/languages/GermanExtra.nsh 
b/extras/package/win32/NSIS/languages/GermanExtra.nsh
index 8e9e237698..c5fc9134ff 100644
--- a/extras/package/win32/NSIS/languages/GermanExtra.nsh
+++ b/extras/package/win32/NSIS/languages/GermanExtra.nsh
@@ -39,6 +39,7 @@ ${LangFileString} Action_OnArrivalSVCDMovie "SVCD-Video 
wiedergeben"
 ${LangFileString} Action_OnArrivalVideoFiles "Videodateien wiedergeben"
 ${LangFileString} Action_OnArrivalMusicFiles "Audiodateien wiedergeben"
 ${LangFileString} Action_OnArrivalDVDAudio "Audio-DVD wiedergeben"
+${LangFileString} Action_OnArrivalBluray "Blu-ray wiedergeben"
 ${LangFileString} License_NextText "Jetzt sind Sie über Ihre Rechte 
informiert. Klicken Sie auf Weiter."
 ${LangFileString} Detail_CheckProcesses "Überprüfen der Prozesse..."
 ${LangFileString} MessageBox_VLCRunning "VLC scheint ausgeführt zu werden und 
wird nun geschlossen."

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

[vlc-commits] l10n: Add missing Blu-ray string to NSIS Portuguese translation

2018-02-05 Thread Marvin Scholz

vlc | branch: master | Marvin Scholz  | Mon Feb  5 23:06:53 
2018 +0100| [bdb571a52ef4cb9383aa5d2fa6cee11a763d675b] | committer: Marvin 
Scholz

l10n: Add missing Blu-ray string to NSIS Portuguese translation

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

 extras/package/win32/NSIS/languages/PortugueseExtra.nsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/win32/NSIS/languages/PortugueseExtra.nsh 
b/extras/package/win32/NSIS/languages/PortugueseExtra.nsh
index 62c37f7f76..824f35a303 100644
--- a/extras/package/win32/NSIS/languages/PortugueseExtra.nsh
+++ b/extras/package/win32/NSIS/languages/PortugueseExtra.nsh
@@ -39,6 +39,7 @@ ${LangFileString} Action_OnArrivalSVCDMovie "Reproduzir filme 
SVCD"
 ${LangFileString} Action_OnArrivalVideoFiles "Reproduzir ficheiros de vídeo"
 ${LangFileString} Action_OnArrivalMusicFiles "Reproduzir ficheiros de áudio"
 ${LangFileString} Action_OnArrivalDVDAudio "Reproduzir áudio DVD"
+${LangFileString} Action_OnArrivalBluray "Reproduzir Blu-ray"
 ${LangFileString} License_NextText "Agora está ciente dos seus direitos. 
Clique em 'Seguinte' para continuar."
 ${LangFileString} Detail_CheckProcesses "A verificar os processos ..."
 ${LangFileString} MessageBox_VLCRunning "Parece que o VLC está em execução e 
será fechado agora."

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

[vlc-commits] l10n: Korean update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:17:09 2018 -0500| [e6afc82ac2a01c8481a7f2d0ad6c1f461c363fea] | committer: 
Christoph Miebach

l10n: Korean update

Signed-off-by: Christoph Miebach 

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

 po/ko.po | 117 ++-
 1 file changed, 63 insertions(+), 54 deletions(-)

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

[vlc-commits] l10n: Nepali update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:25:46 2018 -0500| [e6234a45ee4d689dc37081223390c6d30867e23e] | committer: 
Christoph Miebach

l10n: Nepali update

Signed-off-by: Christoph Miebach 

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

 po/ne.po | 86 ++--
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/po/ne.po b/po/ne.po
index 334ea09b36..3fb1e454f1 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -17,11 +17,11 @@
 # Suyogya , 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-rc3\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2017-02-06 13:43+\n"
-"Last-Translator: Prabin Thapa Magar , 2018\n"
+"Last-Translator: Surit Aryal , 2018\n"
 "Language-Team: Nepali (Nepal) (https://www.transifex.com/yaron/teams/16553/";
 "ne_NP/)\n"
 "Language: ne\n"
@@ -87,8 +87,8 @@ msgstr "VLC को नियन्त्रण इन्टरफेसहरू
 msgid "Hotkeys settings"
 msgstr "हटकी सेटिङहरू"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -222,7 +222,7 @@ msgstr ""
 
 #: include/vlc_config_cat.h:107
 msgid "Stream filters"
-msgstr ""
+msgstr "स्ट्रिम फिल्टरहरू"
 
 #: include/vlc_config_cat.h:109
 msgid ""
@@ -727,7 +727,8 @@ msgstr "हेडफोन"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "स्वचालित"
@@ -969,8 +970,8 @@ msgstr "भाषा"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "वर्णन"
 
@@ -1177,28 +1178,24 @@ msgid "Projection"
 msgstr "प्रोजेक्शन"
 
 #: src/input/es_out.c:3264
-#, fuzzy
 msgctxt "ViewPoint"
 msgid "Yaw"
-msgstr "य"
+msgstr ""
 
 #: src/input/es_out.c:3266
-#, fuzzy
 msgctxt "ViewPoint"
 msgid "Pitch"
 msgstr "पिच"
 
 #: src/input/es_out.c:3268
-#, fuzzy
 msgctxt "ViewPoint"
 msgid "Roll"
-msgstr "रोल"
+msgstr ""
 
 #: src/input/es_out.c:3271
-#, fuzzy
 msgctxt "ViewPoint"
 msgid "Field of view"
-msgstr "दृश्य को क्षेत्र"
+msgstr ""
 
 #: src/input/es_out.c:3276
 msgid "Max. luminance"
@@ -1237,11 +1234,12 @@ msgstr "तपाईंको ईनपुट खोल्न सकिदैन
 msgid "VLC is unable to open the MRL '%s'. Check the log for details."
 msgstr "VLC को MRL '%s' खोल्न असमर्थ छौ। विवरण को लागि प्रवेश को जाँच गरौ। "
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1714,7 +1712,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -4775,7 +4774,8 @@ msgid "Browser Stop"
 msgstr "Browser रोक"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6563,7 +6563,8 @@ ms

[vlc-commits] l10n: German update

2018-02-05 Thread Michał Trzebiatowski

vlc/vlc-3.0 | branch: master | Michał Trzebiatowski  | 
Mon Feb  5 14:56:49 2018 -0500| [939226838fd484f9f0648103713e20ff22572165] | 
committer: Christoph Miebach

l10n: German update

Signed-off-by: Christoph Miebach 

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

 po/de.po | 89 +++-
 1 file changed, 49 insertions(+), 40 deletions(-)

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

[vlc-commits] l10n: Simplified Chinese update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:38:06 2018 -0500| [1fde8403c7c72d74219dda8365f7d1772a8780b6] | committer: 
Christoph Miebach

l10n: Simplified Chinese update

Signed-off-by: Christoph Miebach 

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

 po/zh_CN.po | 71 ++---
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a821e4d02..1a7d6f1612 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@
 # zhangmin , 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-git\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2017-11-16 03:18+0100\n"
@@ -81,8 +81,8 @@ msgstr "VLC 控制界面设置"
 msgid "Hotkeys settings"
 msgstr "热键设置"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -717,7 +717,8 @@ msgstr "耳机"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "自动"
@@ -985,8 +986,8 @@ msgstr "语言"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "描述"
 
@@ -1249,11 +1250,12 @@ msgstr "您的输入无法被打开"
 msgid "VLC is unable to open the MRL '%s'. Check the log for details."
 msgstr "VLC 无法打开 MRL「%s」。详情请检查日志。"
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1714,7 +1716,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -4749,7 +4752,8 @@ msgid "Browser Stop"
 msgstr "浏览器停止"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6548,7 +6552,8 @@ msgid ""
 "frequency. This is required to tune the receiver."
 msgstr "TV 频道被脉冲转发器按指定频率分组 (即混流)。调谐接收器时需要此项。"
 
-#: modules/access/dtv/access.c:61 modules/gui/qt/components/open_panels.cpp:970
+#: modules/access/dtv/access.c:61
+#: modules/gui/qt/components/open_panels.cpp:970
 msgid "Modulation / Constellation"
 msgstr "调制 / 组合"
 
@@ -7332,7 +7337,8 @@ msgstr "音频基本流的声道数目"
 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:238
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167
 #: modules/gui/qt/components/extended_panels.cpp:1297 modules/spu/mosaic.c:94
-#: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108
+#: modules/video_output/vmem.c:42
+#: share/lua/http/dialogs/mosaic_window.html:108
 #: modules/gui/qt/ui/profiles.h:743
 msgid "Width"
 msgstr "宽度"
@@ -8271,7 +8277,8 @@ msgstr "电台设备"
 msgid "Radio tuner device node."
 msgstr "无线电调谐器设备节点。"
 
-#: modules/access/v4l2/v4l2.c:75 modules/gui/qt/components/open_panels.cpp:1077

[vlc-commits] l10n: Brazilian Portuguese update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:29:47 2018 -0500| [beba2b04adf0456f60ac70d259e991902b31ccda] | committer: 
Christoph Miebach

l10n: Brazilian Portuguese update

Signed-off-by: Christoph Miebach 

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

 po/pt_BR.po | 81 ++---
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6ee7943692..33f6cc9702 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 # ssdoria , 2008-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-git\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2016-01-22 02:26+\n"
@@ -76,8 +76,8 @@ msgstr "Configurações para as interfaces de controle do VLC"
 msgid "Hotkeys settings"
 msgstr "Configurações de atalhos"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -737,7 +737,8 @@ msgstr "Fones de ouvido"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "Automático"
@@ -1013,8 +1014,8 @@ msgstr "Idioma"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "Descrição"
 
@@ -1279,11 +1280,12 @@ msgstr ""
 "O VLC não é capaz de abrir o MRL '%s'. Verifique o registro de erros para "
 "maiores detalhes."
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1770,7 +1772,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -5011,7 +5014,8 @@ msgid "Browser Stop"
 msgstr "Parar no Navegador"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6877,7 +6881,8 @@ msgstr ""
 "Os canais de TV são agrupados pelo transponder (i.e., combinador) em uma "
 "dada frequência. Necessário para sintonizar o receptor."
 
-#: modules/access/dtv/access.c:61 modules/gui/qt/components/open_panels.cpp:970
+#: modules/access/dtv/access.c:61
+#: modules/gui/qt/components/open_panels.cpp:970
 msgid "Modulation / Constellation"
 msgstr "Modulação / Constelação"
 
@@ -7694,7 +7699,8 @@ msgstr "Contagem de canais de um fluxo de áudio primário"
 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:238
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167
 #: modules/gui/qt/components/extended_panels.cpp:1297 modules/spu/mosaic.c:94
-#: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108
+#: modules/video_output/vmem.c:42
+#: share/lua/http/dialogs/mosaic_window.html:108
 #: modules/gui/qt/ui/profiles.h:743
 msgid "Width"
 ms

[vlc-commits] l10n: Slovenian update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:31:16 2018 -0500| [854d3ad1bf4304884a3eff4f527d84457cfe20c6] | committer: 
Christoph Miebach

l10n: Slovenian update

Signed-off-by: Christoph Miebach 

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

 po/sl.po | 385 +--
 1 file changed, 201 insertions(+), 184 deletions(-)

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

[vlc-commits] l10n: Italian update

2018-02-05 Thread Vincenzo Reale

vlc/vlc-3.0 | branch: master | Vincenzo Reale  | Mon Feb  
5 15:14:18 2018 -0500| [1ba62e8268e7857dd269c20a56c93bd7ca618b48] | committer: 
Christoph Miebach

l10n: Italian update

Signed-off-by: Christoph Miebach 

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

 po/it.po | 135 +++
 1 file changed, 75 insertions(+), 60 deletions(-)

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

[vlc-commits] l10n: Norwegian Bokmål update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:22:45 2018 -0500| [fbbde4e7b784172e8a9895b19d8ca927c74e1397] | committer: 
Christoph Miebach

l10n: Norwegian Bokmål update

Signed-off-by: Christoph Miebach 

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

 po/nb.po | 215 +--
 1 file changed, 114 insertions(+), 101 deletions(-)

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

[vlc-commits] l10n: Dutch update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:26:31 2018 -0500| [1ac8c44207ee423d5666eb72f543d172c1880c64] | committer: 
Christoph Miebach

l10n: Dutch update

Signed-off-by: Christoph Miebach 

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

 po/nl.po | 73 
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 468e2208a1..475f651bbe 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,11 +9,11 @@
 # Thomas De Rocker, 2008-2017
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-git\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2017-12-26 23:46+0100\n"
-"Last-Translator: Thomas De Rocker , 2017\n"
+"Last-Translator: Thomas De Rocker, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/yaron/teams/16553/nl/)\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -79,8 +79,8 @@ msgstr "Instellingen voor VLC's bedieningsinterfaces"
 msgid "Hotkeys settings"
 msgstr "Sneltoetsen"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -740,7 +740,8 @@ msgstr "Koptelefoon"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "Automatisch"
@@ -1018,8 +1019,8 @@ msgstr "Taal"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -1282,11 +1283,12 @@ msgstr "Uw invoer kan niet geopend worden"
 msgid "VLC is unable to open the MRL '%s'. Check the log for details."
 msgstr "VLC kon de MRL '%s' niet openen. Controleer het logboek voor details."
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1775,7 +1777,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -5031,7 +5034,8 @@ msgid "Browser Stop"
 msgstr "Browser stoppen"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6891,7 +6895,8 @@ msgstr ""
 "Tv-kanalen worden gegroepeerd op transponder (multiplex) bij een gegeven "
 "frequentie. Dit is vereist om de ontvanger af te stemmen."
 
-#: modules/access/dtv/access.c:61 modules/gui/qt/components/open_panels.cpp:970
+#: modules/access/dtv/access.c:61
+#: modules/gui/qt/components/open_panels.cpp:970
 msgid "Modulation / Constellation"
 msgstr "Modulatie / Constellatie"
 
@@ -7708,7 +7713,8 @@ msgstr "Aantal kanalen van een elementaire audiostream"
 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:238
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167
 #: modules/gui/qt/components/extended_panels.c

[vlc-commits] l10n: Norwegian Nynorsk update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:27:26 2018 -0500| [cd77604d89a6b6ca9e545ebc3229ebc9e4cb04bb] | committer: 
Christoph Miebach

l10n: Norwegian Nynorsk update

Signed-off-by: Christoph Miebach 

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

 po/nn.po | 192 +--
 1 file changed, 100 insertions(+), 92 deletions(-)

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

[vlc-commits] l10n: Swedish update

2018-02-05 Thread A . Regnander

vlc/vlc-3.0 | branch: master | A. Regnander  | Mon Feb  
5 16:34:05 2018 -0500| [7179660f8d6446abd431124c7d0e0cbf3d7d788f] | committer: 
Christoph Miebach

l10n: Swedish update

Signed-off-by: Christoph Miebach 

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

 po/sv.po | 470 ++-
 1 file changed, 255 insertions(+), 215 deletions(-)

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

[vlc-commits] l10n: Turkish update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:33:47 2018 -0500| [912d9b76340c7a4a436d87b7d7810c8d39a54560] | committer: 
Christoph Miebach

l10n: Turkish update

Signed-off-by: Christoph Miebach 

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

 po/tr.po | 81 +++-
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index d1d2e0d08e..f5327772c3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17,7 +17,7 @@
 # Yaşar TAY , 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-git\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2017-12-11 00:15+0100\n"
@@ -86,8 +86,8 @@ msgstr "VLC denetim arayüzleri ayarları"
 msgid "Hotkeys settings"
 msgstr "Kısayol tuşları ayarları"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -747,7 +747,8 @@ msgstr "Kulaklık"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "Otomatik"
@@ -1024,8 +1025,8 @@ msgstr "Dil"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "Açıklama"
 
@@ -1290,11 +1291,12 @@ msgstr ""
 "VLC, '%s' ortam kaynağı adresini (MRL) açamıyor. Ayrıntılar için günlük "
 "dosyasına bakın."
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1782,7 +1784,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -5068,7 +5071,8 @@ msgid "Browser Stop"
 msgstr "Tarayıcı Durdurma"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6920,7 +6924,8 @@ msgstr ""
 "TV kanalları, verilen bir frekansta, yayınlandığı transponder ile gruplanır "
 "(ya da çoklanır). Alıcıyı ayarlamak için bu gereklidir."
 
-#: modules/access/dtv/access.c:61 modules/gui/qt/components/open_panels.cpp:970
+#: modules/access/dtv/access.c:61
+#: modules/gui/qt/components/open_panels.cpp:970
 msgid "Modulation / Constellation"
 msgstr "Modülasyon / Burç"
 
@@ -7728,7 +7733,8 @@ msgstr "Bir ses temel akışının kanal sayısı"
 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:238
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167
 #: modules/gui/qt/components/extended_panels.cpp:1297 modules/spu/mosaic.c:94
-#: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108
+#: modules/video_output/vmem.c:42
+#: share/lua/http/dialogs/mosaic_window.html:108
 #: modules/gui/qt/ui/profiles.h:743
 msgid "Width"
 msgstr "En"
@@ -8705,7 +8711,8 @@ msgstr "Radyo Aygıtı"
 msgid "Radio tuner devic

[vlc-commits] l10n: Ukrainian update

2018-02-05 Thread Andriy Bandura

vlc/vlc-3.0 | branch: master | Andriy Bandura  | 
Mon Feb  5 15:35:44 2018 -0500| [09f4890b177885477b5499b3651c35154497fa33] | 
committer: Christoph Miebach

l10n: Ukrainian update

Signed-off-by: Christoph Miebach 

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

 po/uk.po | 81 +++-
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index f510204f51..100af64023 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@
 # Андрій Бандура , 2013-2017
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-git\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2017-11-16 03:16+0100\n"
@@ -78,8 +78,8 @@ msgstr "Установки інтерфейсів елементів керув
 msgid "Hotkeys settings"
 msgstr "Установки гарячих клавіш"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -736,7 +736,8 @@ msgstr "Навушники"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "Автоматично"
@@ -1010,8 +1011,8 @@ msgstr "Мова"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "Опис"
 
@@ -1276,11 +1277,12 @@ msgstr ""
 "VLC не вдалося відкрити MRL „%s“. Щоб отримати докладнішу інформацію, "
 "дивіться журнал."
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1767,7 +1769,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -4997,7 +5000,8 @@ msgid "Browser Stop"
 msgstr "Браузер Зупинка"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6857,7 +6861,8 @@ msgstr ""
 "ТБ-канали групуються за транспондером (так званий „мультиплекс“) на "
 "визначеній частоті. Це потрібно для налаштування приймача."
 
-#: modules/access/dtv/access.c:61 modules/gui/qt/components/open_panels.cpp:970
+#: modules/access/dtv/access.c:61
+#: modules/gui/qt/components/open_panels.cpp:970
 msgid "Modulation / Constellation"
 msgstr "Модуляція / Сигнальне сузір’я"
 
@@ -7670,7 +7675,8 @@ msgstr "Число звукових каналів елементарного п
 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:238
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167
 #: modules/gui/qt/components/extended_panels.cpp:1297 modules/spu/mosaic.c:94
-#: modules/video_output/vmem.c:42 share/lua/http/dialogs/mosaic_window.html:108
+#: modules/video_output/vmem.c:42
+#: share/lua/http/dialogs/mosaic_window.html:108
 #: modules/gui/qt/ui/profiles.h:743
 msgid "Width"
 msgstr "Ширина"
@@ -8647,7 +8653,8 @@ msgstr "Радіопри

[vlc-commits] l10n: Irish update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:06:40 2018 -0500| [9a5bd76a644f747a85a33389b8d904e810266c5b] | committer: 
Christoph Miebach

l10n: Irish update

Signed-off-by: Christoph Miebach 

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

 po/ga.po | 251 +--
 1 file changed, 133 insertions(+), 118 deletions(-)

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

[vlc-commits] l10n: Polish update

2018-02-05 Thread Michał Trzebiatowski

vlc/vlc-3.0 | branch: master | Michał Trzebiatowski  | 
Mon Feb  5 15:28:41 2018 -0500| [10883720fe894317bc3ca7d4477ffd5f353a6c4c] | 
committer: Christoph Miebach

l10n: Polish update

Signed-off-by: Christoph Miebach 

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

 po/pl.po | 89 +++-
 1 file changed, 49 insertions(+), 40 deletions(-)

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

[vlc-commits] l10n: Latvian update

2018-02-05 Thread Ingmārs Dīriņš

vlc/vlc-3.0 | branch: master | Ingmārs Dīriņš  | Mon Feb  
5 15:18:34 2018 -0500| [0b615055e7c384ce206b708e35e6f9dbc9a16869] | committer: 
Christoph Miebach

l10n: Latvian update

Signed-off-by: Christoph Miebach 

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

 po/lv.po | 92 ++--
 1 file changed, 55 insertions(+), 37 deletions(-)

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

[vlc-commits] l10n: French update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:02:23 2018 -0500| [4d6537eb976d2859cf2c83affc5c11a9de30542a] | committer: 
Christoph Miebach

l10n: French update

Signed-off-by: Christoph Miebach 

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

 po/fr.po | 224 ++-
 1 file changed, 121 insertions(+), 103 deletions(-)

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

[vlc-commits] l10n: Hungarian update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:10:48 2018 -0500| [6c7f455186d3a8c6e339c71bc9966d09d9dac490] | committer: 
Christoph Miebach

l10n: Hungarian update

Signed-off-by: Christoph Miebach 

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

 po/hu.po | 157 ---
 1 file changed, 100 insertions(+), 57 deletions(-)

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

[vlc-commits] l10n: Basque update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:00:19 2018 -0500| [5059343b22fbc1d921138645cd737ccd29b4c1bf] | committer: 
Christoph Miebach

l10n: Basque update

Signed-off-by: Christoph Miebach 

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

 po/eu.po | 75 
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/po/eu.po b/po/eu.po
index ae5ce07dd4..fc4759f478 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,11 +11,11 @@
 # LEIRE LÓPEZ GOIBURU , 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: vlc 3.0.0-git\n"
+"Project-Id-Version: vlc 3.0.0-rc8\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-01-30 00:41+0100\n"
 "PO-Revision-Date: 2016-04-04 16:53+\n"
-"Last-Translator: julen , 2017\n"
+"Last-Translator: julen, 2017\n"
 "Language-Team: Basque (https://www.transifex.com/yaron/teams/16553/eu/)\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
@@ -79,8 +79,8 @@ msgstr "VLCren kontrol-interfazeetarako ezarpenak"
 msgid "Hotkeys settings"
 msgstr "Laster-teklen ezarpenak"
 
-#: include/vlc_config_cat.h:53 src/input/es_out.c:3091 src/libvlc-module.c:1486
-#: modules/access/imem.c:64
+#: include/vlc_config_cat.h:53 src/input/es_out.c:3091
+#: src/libvlc-module.c:1486 modules/access/imem.c:64
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:171
 #: modules/gui/macosx/VLCMainMenu.m:404 modules/gui/macosx/VLCOutput.m:92
 #: modules/gui/macosx/VLCPlaylistInfo.m:96
@@ -754,7 +754,8 @@ msgstr "Aurikularrak"
 #: modules/access/dtv/access.c:106 modules/access/dtv/access.c:115
 #: modules/access/dtv/access.c:123 modules/access/dtv/access.c:132
 #: modules/access/dtv/access.c:140 modules/access/dtv/access.c:162
-#: modules/access/v4l2/v4l2.c:137 modules/gui/qt/components/open_panels.cpp:974
+#: modules/access/v4l2/v4l2.c:137
+#: modules/gui/qt/components/open_panels.cpp:974
 #: modules/gui/qt/components/simple_preferences.cpp:370
 msgid "Automatic"
 msgstr "Automatikoa"
@@ -1034,8 +1035,8 @@ msgstr "Hizkuntza"
 
 #: src/input/es_out.c:3085 src/input/meta.c:61
 #: modules/gui/macosx/VLCBookmarksWindowController.m:83
-#: modules/gui/macosx/VLCPlaylist.m:112 modules/gui/qt/dialogs/bookmarks.cpp:75
-#: modules/gui/qt/dialogs/epg.cpp:55
+#: modules/gui/macosx/VLCPlaylist.m:112
+#: modules/gui/qt/dialogs/bookmarks.cpp:75 modules/gui/qt/dialogs/epg.cpp:55
 msgid "Description"
 msgstr "Deskribapena"
 
@@ -1298,11 +1299,12 @@ msgstr "Zure sarrera ezin da ireki"
 msgid "VLC is unable to open the MRL '%s'. Check the log for details."
 msgstr "VLCk ezin du ireki '%s' MRLa. Begiratu egunkaria xehetasunak jakiteko."
 
-#: src/input/meta.c:55 src/input/var.c:170 modules/gui/macosx/VLCMainMenu.m:399
-#: modules/gui/macosx/VLCMainMenu.m:400
+#: src/input/meta.c:55 src/input/var.c:170
+#: modules/gui/macosx/VLCMainMenu.m:399 modules/gui/macosx/VLCMainMenu.m:400
 #: modules/gui/macosx/VLCOpenWindowController.m:178
 #: modules/gui/macosx/VLCOpenWindowController.m:180
-#: modules/gui/macosx/VLCPlaylist.m:107 modules/gui/macosx/VLCPlaylistInfo.m:63
+#: modules/gui/macosx/VLCPlaylist.m:107
+#: modules/gui/macosx/VLCPlaylistInfo.m:63
 #: modules/gui/qt/components/open_panels.cpp:507
 #: modules/gui/qt/components/open_panels.cpp:521
 #: modules/gui/qt/dialogs/epg.cpp:70 modules/mux/asf.c:56
@@ -1794,7 +1796,8 @@ msgstr ""
 
 #: src/libvlc-module.c:187 src/libvlc-module.c:361 src/win32/thread.c:942
 #: modules/audio_output/kai.c:106 modules/codec/x264.c:440
-#: modules/demux/mpeg/ts.c:124 modules/gui/macosx/VLCSimplePrefsController.m:54
+#: modules/demux/mpeg/ts.c:124
+#: modules/gui/macosx/VLCSimplePrefsController.m:54
 #: modules/gui/qt/components/simple_preferences.cpp:66
 #: modules/gui/qt/components/sout/profile_selector.cpp:582
 #: modules/text_renderer/freetype/freetype.c:151 modules/video_output/kva.c:62
@@ -5103,7 +5106,8 @@ msgid "Browser Stop"
 msgstr "Nabigatzailea gelditu"
 
 #: src/misc/actions.c:62 modules/gui/macosx/VLCMainMenu.m:361
-#: modules/gui/macosx/VLCPlaylist.m:231 modules/gui/qt/dialogs/bookmarks.cpp:50
+#: modules/gui/macosx/VLCPlaylist.m:231
+#: modules/gui/qt/dialogs/bookmarks.cpp:50
 #: modules/gui/qt/ui/podcast_configuration.h:104
 #: modules/gui/qt/ui/streampanel.h:172
 msgid "Delete"
@@ -6964,7 +6968,8 @@ msgstr ""
 "Telebista-kateak satelite-errepikagailuaren arabera taldekatzen dira "
 "maiztasun jakin batean. Hori beharrezkoa da hargailua sintonizatzeko."
 
-#: modules/access/dtv/access.c:61 modules/gui/qt/components/open_panels.cpp:970
+#: modules/access/dtv/access.c:61
+#: modules/gui/qt/components/open_panels.cpp:970
 msgid "Modulation / Constellation"
 msgstr "Modulazioa / Konstelazioa"
 
@@ -7789,7 +7794,8 @@ msgstr "Audioaren oinarrizko transmisio jarraituaren 
kanal kopurua"
 #: modules/gui/macosx/VLCAudioEffectsWindowController.m:238
 #: modules/gui/macosx/VLCConvertAndSaveWindowController.m:167
 #: modules/gui/qt/components

[vlc-commits] l10n: Malay update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:20:40 2018 -0500| [4817e519503f9fabbd870f4968ccb73252eddf3f] | committer: 
Christoph Miebach

l10n: Malay update

Signed-off-by: Christoph Miebach 

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

 po/ms.po | 90 +++-
 1 file changed, 50 insertions(+), 40 deletions(-)

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

[vlc-commits] l10n: West Frisian update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:04:56 2018 -0500| [0b4f06aee3ce6d32f7ec8bf1f9058a66516c5112] | committer: 
Christoph Miebach

l10n: West Frisian update

Signed-off-by: Christoph Miebach 

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

 po/fy.po | 332 +++
 1 file changed, 185 insertions(+), 147 deletions(-)

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

[vlc-commits] l10n: Japanese update

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon Feb  5 
15:15:29 2018 -0500| [ba308815dced8e1e3bf614b018f54fd6eb304643] | committer: 
Christoph Miebach

l10n: Japanese update

Signed-off-by: Christoph Miebach 

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

 po/ja.po | 502 ---
 1 file changed, 256 insertions(+), 246 deletions(-)

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

[vlc-commits] win32: Also install lua resources

2018-02-05 Thread Hugo Beauzée-Luyssen

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen  | Sat Feb 
 3 17:51:37 2018 +0100| [7fd951d7420af81beeef698caf296fc0a08d3bf8] | committer: 
David Fuhrmann

win32: Also install lua resources

(cherry picked from commit 0ab467283266ae0a9b49665e7f3c32a8afe28515)
Signed-off-by: David Fuhrmann 

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

 extras/package/win32/package.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index b9ae7a2d9f..1c071d2c37 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -61,6 +61,7 @@ package-win-common: package-win-install package-win-sdk
 if BUILD_LUA
mkdir -p $(win32_destdir)/lua/
cp -r $(prefix)/lib/vlc/lua/* $(win32_destdir)/lua/
+   cp -r $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/
 endif
 
 if BUILD_SKINS

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

[vlc-commits] chroma:copy: use the proper defines to access the planes in picture_SwapUV()

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
14:17:09 2018 +0100| [76875393e2acb0906edb067d381332ba43fecbc3] | committer: 
Jean-Baptiste Kempf

chroma:copy: use the proper defines to access the planes in picture_SwapUV()

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

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

 modules/video_chroma/copy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_chroma/copy.c b/modules/video_chroma/copy.c
index cb45e23c7b..50885aee74 100644
--- a/modules/video_chroma/copy.c
+++ b/modules/video_chroma/copy.c
@@ -832,9 +832,9 @@ void picture_SwapUV(picture_t *picture)
 {
 assert(picture->i_planes == 3);
 
-plane_t tmp_plane = picture->p[1];
-picture->p[1] = picture->p[2];
-picture->p[2] = tmp_plane;
+plane_t tmp_plane   = picture->p[U_PLANE];
+picture->p[U_PLANE] = picture->p[V_PLANE];
+picture->p[V_PLANE] = tmp_plane;
 }
 
 int picture_UpdatePlanes(picture_t *picture, uint8_t *data, unsigned pitch)

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

[vlc-commits] chromecast: don't send stop/seek msg when not playing

2018-02-05 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Mon Feb  5 
18:09:44 2018 +0100| [4fe21646460205eb26b691b646c8382c2fbada7f] | committer: 
Jean-Baptiste Kempf

chromecast: don't send stop/seek msg when not playing

This fixes inconsistent states when the cc is already stopped.

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

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

 modules/stream_out/chromecast/chromecast.h|  1 +
 modules/stream_out/chromecast/chromecast_ctrl.cpp | 41 +--
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast.h 
b/modules/stream_out/chromecast/chromecast.h
index b477d2a578..4f0ecd9300 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -165,6 +165,7 @@ struct intf_sys_t
 bool isFinishedPlaying();
 
 void setHasInput(const std::string mime_type = "");
+bool isPlaying() const;
 
 void requestPlayerSeek(mtime_t pos);
 void requestPlayerStop();
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 98b1d6c61a..dad14c0334 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -297,6 +297,21 @@ void intf_sys_t::setHasInput( const std::string mime_type )
 m_eof = false;
 }
 
+bool intf_sys_t::isPlaying() const
+{
+switch( m_state )
+{
+case Loading:
+case Buffering:
+case Playing:
+case Paused:
+case Seeking:
+return true;
+default:
+return false;
+}
+}
+
 /**
  * @brief Process a message received from the Chromecast
  * @param msg the CastMessage to process
@@ -367,11 +382,21 @@ void intf_sys_t::mainLoop()
 switch ( msg )
 {
 case Stop:
-m_communication.msgPlayerStop( m_appTransportId, 
m_mediaSessionId );
-setState( Stopping );
+if( isPlaying() )
+{
+if ( m_mediaSessionId == 0 )
+m_request_stop = true;
+else
+{
+m_communication.msgPlayerStop( m_appTransportId, 
m_mediaSessionId );
+setState( Stopping );
+}
+}
 break;
 case Seek:
 {
+if( !isPlaying() || m_mediaSessionId == 0 )
+break;
 char current_time[32];
 mtime_t seek_request_time = mdate() + SEEK_FORWARD_OFFSET;
 if( snprintf( current_time, sizeof(current_time), "%.3f",
@@ -799,15 +824,9 @@ void intf_sys_t::requestPlayerStop()
 m_art_stream = NULL;
 }
 
-if ( m_state == TakenOver )
+if( !isPlaying() )
 return;
 
-if ( m_mediaSessionId == 0 )
-{
-m_request_stop = true;
-return;
-}
-
 queueMessage( Stop );
 }
 
@@ -820,7 +839,7 @@ States intf_sys_t::state() const
 void intf_sys_t::requestPlayerSeek(mtime_t pos)
 {
 vlc_mutex_locker locker(&m_lock);
-if ( m_mediaSessionId == 0 )
+if( !isPlaying() || m_mediaSessionId == 0 )
 return;
 if ( pos != VLC_TS_INVALID )
 m_ts_local_start = pos;
@@ -860,7 +879,7 @@ void intf_sys_t::waitAppStarted()
 m_state = Launching;
 m_communication.msgReceiverLaunchApp();
 }
-msg_Dbg( m_module, "Waiting for Chromecast media receiver app to be 
ready" );
+msg_Info( m_module, "Waiting for Chromecast media receiver app to be 
ready: %d", m_state );
 vlc_cond_wait(&m_stateChangedCond, &m_lock);
 }
 msg_Dbg( m_module, "Done waiting for application. transportId: %s", 
m_appTransportId.c_str() );

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

[vlc-commits] direct3d9: use a different vout for HDR content if possible

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
18:01:31 2018 +0100| [706c91ba6ebef1ccb347e9fd62885f6262b21e1b] | committer: 
Jean-Baptiste Kempf

direct3d9: use a different vout for HDR content if possible

Similar to what we do with 360 videos.

It should fallback to OpenGL on Win7.

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

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

 modules/video_output/win32/direct3d9.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/video_output/win32/direct3d9.c 
b/modules/video_output/win32/direct3d9.c
index 71b517a59d..d60e92e7ed 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -248,6 +248,9 @@ static int Open(vlc_object_t *object)
 if ( !vd->obj.force && vd->source.projection_mode != 
PROJECTION_MODE_RECTANGULAR)
 return VLC_EGENERIC; /* let a module who can handle it do it */
 
+if ( !vd->obj.force && vd->source.mastering.max_luminance != 0)
+return VLC_EGENERIC; /* let a module who can handle it do it */
+
 OSVERSIONINFO winVer;
 winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 if(GetVersionEx(&winVer) && winVer.dwMajorVersion < 6 && 
!object->obj.force)

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

[vlc-commits] direct3d11: log the sampler as well

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
18:10:33 2018 +0100| [92f2c99d777e4b731570910db7edf0831fdff50a] | committer: 
Jean-Baptiste Kempf

direct3d11: log the sampler as well

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

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

 modules/video_output/win32/direct3d11.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index f3f220f326..949419fcfe 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1945,6 +1945,7 @@ static HRESULT CompilePixelShader(vout_display_t *vd, 
const d3d_format_t *format
 msg_Dbg(vd,"psz_peak_luminance %s", psz_peak_luminance);
 msg_Dbg(vd,"psz_display_transform %s", psz_display_transform);
 msg_Dbg(vd,"psz_adjust_range %s", psz_adjust_range);
+msg_Dbg(vd,"psz_sampler %s", psz_sampler);
 }
 #endif
 free(psz_range);

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

[vlc-commits] hw:d3d9: no need to swap the planes when running the external converter

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
13:54:14 2018 +0100| [bbd85487c52c97cbe48a56c16eadbcfa1f5f593a] | committer: 
Jean-Baptiste Kempf

hw:d3d9: no need to swap the planes when running the external converter

It's already taking care of the proper plane swapping.

Fixes #19482 (without breaking #19543)

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

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

 modules/hw/d3d9/dxa9.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index fd26261ada..f0e97020e1 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -270,11 +270,7 @@ static void YV12_D3D9(filter_t *p_filter, picture_t *src, 
picture_t *dst)
 
 picture_Hold( src );
 
-if (src->format.i_chroma == VLC_CODEC_I420)
-plane_SwapUV( src->p );
 sys->filter->pf_video_filter(sys->filter, src);
-if (src->format.i_chroma == VLC_CODEC_I420)
-plane_SwapUV( src->p );
 
 IDirect3DSurface9_UnlockRect(sys->staging->p_sys->surface);
 

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

[vlc-commits] Added danish translation for vlc.desktop.

2018-02-05 Thread VideoLAN

vlc/vlc-3.0 | branch: master | VideoLAN  | Sat Feb  3 
17:02:09 2018 +0100| [7fc3c91af4077501ef1a650fa36cbae5682eb8b2] | committer: 
Jean-Baptiste Kempf

Added danish translation for vlc.desktop.

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

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

 share/vlc.desktop.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index 19d4134688..69c00af25e 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -11,6 +11,9 @@ Comment[br]=Lenn, enrollañ, skignañ ho lanvioù liesvedia
 Name[ca]=Reproductor multimèdia VLC
 GenericName[ca]=Reproductor multimèdia
 Comment[ca]=Reproduïu, captureu i difoneu fluxos multimèdia
+Name[da]=VLC media player
+GenericName[da]=Medieafspiller
+Comment[da]=Læs, indspil, transmittér dine multimediestreams
 Name[de]=VLC Media Player
 GenericName[de]=Medienwiedergabe
 Comment[de]=Wiedergabe, Aufnahme und Verbreitung Ihrer Multimedia-Streams

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

[vlc-commits] d3d9_filters: fix a potential crash

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
18:44:30 2018 +0100| [f9e6eda55af6e292e77e724e4f5282101194d0d5] | committer: 
Jean-Baptiste Kempf

d3d9_filters: fix a potential crash

This can happen if more than one filter is used. There is not enough in this 
cases the
picture is created in CPU, not from the GPU pool and it fails.

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

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

 modules/hw/d3d9/d3d9_filters.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hw/d3d9/d3d9_filters.c b/modules/hw/d3d9/d3d9_filters.c
index 90d85fcb88..0dc1488a3d 100644
--- a/modules/hw/d3d9/d3d9_filters.c
+++ b/modules/hw/d3d9/d3d9_filters.c
@@ -107,7 +107,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 picture_sys_t *p_src_sys = ActivePictureSys(p_pic);
 
 picture_t *p_outpic = filter_NewPicture( p_filter );
-if( !p_outpic )
+if( !p_outpic || !p_outpic->p_sys->surface )
 goto failed;
 
 picture_CopyProperties( p_outpic, p_pic );

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

[vlc-commits] HTTP win32: use http-proxy options to setup the proxy

2018-02-05 Thread Jean-Baptiste Kempf

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf  | Fri 
Feb  2 17:22:18 2018 +0100| [4867a39c36492aa9cc85f1fd115ff8e9e5965731] | 
committer: Jean-Baptiste Kempf

HTTP win32: use http-proxy options to setup the proxy

Because win32/netconf is not ready

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

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

 modules/access/http.c | 15 ---
 src/libvlc-module.c   | 22 ++
 src/win32/netconf.c   | 30 --
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index 8d050bdec6..f5b4eacbd1 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -56,16 +56,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define PROXY_TEXT N_("HTTP proxy")
-#define PROXY_LONGTEXT N_( \
-"HTTP proxy to be used It must be of the form " \
-"http://[user@]myproxy.mydomain:myport/ ; " \
-"if empty, the http_proxy environment variable will be tried." )
-
-#define PROXY_PASS_TEXT N_("HTTP proxy password")
-#define PROXY_PASS_LONGTEXT N_( \
-"If your HTTP proxy requires a password, set it here." )
-
 #define RECONNECT_TEXT N_("Auto re-connect")
 #define RECONNECT_LONGTEXT N_( \
 "Automatically try to reconnect to the stream in case of a sudden " \
@@ -78,11 +68,6 @@ vlc_module_begin ()
 set_category( CAT_INPUT )
 set_subcategory( SUBCAT_INPUT_ACCESS )
 
-add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
-false )
-add_password( "http-proxy-pwd", NULL,
-  PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
-add_obsolete_bool( "http-use-IE-proxy" )
 add_bool( "http-reconnect", false, RECONNECT_TEXT,
   RECONNECT_LONGTEXT, true )
 /* 'itpc' = iTunes Podcast */
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 9d29d24b4e..77ab8283ab 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -844,6 +844,16 @@ static const char *const ppsz_prefres[] = {
 #define KEY_LONGTEXT N_( \
"This private key file (PEM format) is used for server-side TLS.")
 
+#define PROXY_TEXT N_("HTTP proxy")
+#define PROXY_LONGTEXT N_( \
+"HTTP proxy to be used It must be of the form " \
+"http://[user@]myproxy.mydomain:myport/ ; " \
+"if empty, the http_proxy environment variable will be tried." )
+
+#define PROXY_PASS_TEXT N_("HTTP proxy password")
+#define PROXY_PASS_LONGTEXT N_( \
+"If your HTTP proxy requires a password, set it here." )
+
 #define SOCKS_SERVER_TEXT N_("SOCKS server")
 #define SOCKS_SERVER_LONGTEXT N_( \
 "SOCKS proxy server to use. This must be of the form " \
@@ -1802,6 +1812,18 @@ vlc_module_begin ()
 add_obsolete_string( "http-crl" ) /* since 3.0.0 */
 add_obsolete_string( "sout-http-crl" ) /* since 2.0.0 */
 
+#ifdef _WIN32
+add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
+false )
+add_password( "http-proxy-pwd", NULL,
+  PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
+#else
+add_obsolete_string( "http-proxy" )
+add_obsolete_string( "http-proxy-pwd" )
+
+#endif
+add_obsolete_bool( "http-use-IE-proxy" )
+
 set_section( N_( "Socks proxy") , NULL )
 add_string( "socks", NULL,
  SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, true )
diff --git a/src/win32/netconf.c b/src/win32/netconf.c
index accdddf2ce..3a6dcda1ea 100644
--- a/src/win32/netconf.c
+++ b/src/win32/netconf.c
@@ -27,10 +27,36 @@
 
 #include 
 #include 
+#include 
 
-char *vlc_getProxyUrl(const char *url)
+char *vlc_getProxyUrl(const char *psz_url)
 {
-char *proxy_url = NULL;
+VLC_UNUSED(psz_url);
+
+char *proxy = config_GetPsz( (vlc_object_t *)(NULL), "http-proxy" );
+if (proxy == NULL)
+return NULL;
+
+char *proxy_pwd = config_GetPsz( (vlc_object_t *)(NULL), "http-proxy-pwd" 
);
+if (proxy_pwd == NULL)
+return proxy;
+
+vlc_url_t url;
+if (vlc_UrlParse(&url, proxy) < 0) {
+free (proxy);
+free (proxy_pwd);
+return NULL;
+}
+
+if (url.psz_password == NULL )
+url.psz_password = vlc_uri_encode(proxy_pwd);
+
+char *proxy_url = vlc_uri_compose (&url);
+vlc_UrlClean (&url);
+
+free (proxy_pwd);
+free (proxy);
+
 #if 0
 /* Try to get the proxy server address from Windows internet settings. */
 HKEY h_key;

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

[vlc-commits] direct3d11: fix the log when the I420 pool is used

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
18:10:14 2018 +0100| [64865a3f34f8ae8bf4747b2fb93ca5662902710b] | committer: 
Jean-Baptiste Kempf

direct3d11: fix the log when the I420 pool is used

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

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

 modules/video_output/win32/direct3d11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 4a4887c7d9..f3f220f326 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -689,7 +689,7 @@ error:
 sys->sys.pool = picture_pool_NewExtended( &pool_cfg );
 } else {
 msg_Dbg(vd, "D3D11 pool succeed with %d surfaces (%dx%d) context 0x%p",
-picture_count, surface_fmt.i_width, surface_fmt.i_height, 
sys->d3d_dev.d3dcontext);
+pool_size, surface_fmt.i_width, surface_fmt.i_height, 
sys->d3d_dev.d3dcontext);
 }
 return sys->sys.pool;
 }

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

[vlc-commits] dxgi_fmt: favor BGRA over RGBA

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
18:12:48 2018 +0100| [0775b4e5c284566f55f52d708a105ba1395b33cf] | committer: 
Jean-Baptiste Kempf

dxgi_fmt: favor BGRA over RGBA

That's the format you get when capturing the screen in D3D11. So it's likely
the internal format.

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

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

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

diff --git a/modules/video_chroma/dxgi_fmt.c b/modules/video_chroma/dxgi_fmt.c
index 1a0ba9e044..384c6b599b 100644
--- a/modules/video_chroma/dxgi_fmt.c
+++ b/modules/video_chroma/dxgi_fmt.c
@@ -79,10 +79,10 @@ static const d3d_format_t d3d_formats[] = {
 { "NV11", DXGI_FORMAT_NV11,   VLC_CODEC_I411,  8, 4, 
1, { DXGI_FORMAT_R8_UNORM,   DXGI_FORMAT_R8G8_UNORM} },
 #endif
 { "I420", DXGI_FORMAT_UNKNOWN,VLC_CODEC_I420,  8, 2, 
2, { DXGI_FORMAT_R8_UNORM,  DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_UNORM } },
-{ "R8G8B8A8", DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_RGBA,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
-{ "VA_RGBA",  DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_D3D11_OPAQUE,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
 { "B8G8R8A8", DXGI_FORMAT_B8G8R8A8_UNORM, VLC_CODEC_BGRA,  8, 1, 
1, { DXGI_FORMAT_B8G8R8A8_UNORM } },
 { "VA_BGRA",  DXGI_FORMAT_B8G8R8A8_UNORM, VLC_CODEC_D3D11_OPAQUE,  8, 1, 
1, { DXGI_FORMAT_B8G8R8A8_UNORM } },
+{ "R8G8B8A8", DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_RGBA,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
+{ "VA_RGBA",  DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_D3D11_OPAQUE,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
 { "R8G8B8X8", DXGI_FORMAT_B8G8R8X8_UNORM, VLC_CODEC_RGB32, 8, 1, 
1, { DXGI_FORMAT_B8G8R8X8_UNORM } },
 { "B5G6R5",   DXGI_FORMAT_B5G6R5_UNORM,   VLC_CODEC_RGB16, 5, 1, 
1, { DXGI_FORMAT_B5G6R5_UNORM } },
 { "I420_OPAQUE", DXGI_FORMAT_420_OPAQUE,  VLC_CODEC_D3D11_OPAQUE,  8, 2, 
2, { DXGI_FORMAT_UNKNOWN } },

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

[vlc-commits] hw:d3d11: deinterlace: adjust the deinterlaced area if there is an offset

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
15:10:00 2018 +0100| [b1b69cf24a7882d3c1789cfe85f0eef4154e956d] | committer: 
Jean-Baptiste Kempf

hw:d3d11: deinterlace: adjust the deinterlaced area if there is an offset

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

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

 modules/hw/d3d11/d3d11_deinterlace.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hw/d3d11/d3d11_deinterlace.c 
b/modules/hw/d3d11/d3d11_deinterlace.c
index b52f76072c..91d26cf912 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -185,10 +185,10 @@ static int RenderPic( filter_t *p_filter, picture_t 
*p_outpic, picture_t *p_pic,
 }
 
 RECT srcRect;
-srcRect.left = 0;
-srcRect.top = 0;
-srcRect.right  = p_pic->format.i_visible_width;
-srcRect.bottom = p_pic->format.i_visible_height;
+srcRect.left   = p_pic->format.i_x_offset;
+srcRect.top= p_pic->format.i_y_offset;
+srcRect.right  = srcRect.left + p_pic->format.i_visible_width;
+srcRect.bottom = srcRect.top  + p_pic->format.i_visible_height;
 ID3D11VideoContext_VideoProcessorSetStreamSourceRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,
  0, TRUE, &srcRect);
 ID3D11VideoContext_VideoProcessorSetStreamDestRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,

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

[vlc-commits] chromecast: postpone stop when loading

2018-02-05 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Mon Feb  5 
17:31:52 2018 +0100| [0e311eb6e4ae6a00729d55de3559e5aa63c0c2fd] | committer: 
Jean-Baptiste Kempf

chromecast: postpone stop when loading

The cc on the nvidia shield can buffer a lot before sending a Buffering/Playing
event. If you stopped during this period (m_mediaSessionId=0), the cc could
play around 5 seconds of video/sound before draining its buffers.

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

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

 modules/stream_out/chromecast/chromecast.h|  1 +
 modules/stream_out/chromecast/chromecast_ctrl.cpp | 20 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast.h 
b/modules/stream_out/chromecast/chromecast.h
index cad32ebbb1..b477d2a578 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -234,6 +234,7 @@ private:
 ChromecastCommunication m_communication;
 std::queue m_msgQueue;
 States m_state;
+bool m_request_stop;
 bool m_eof;
 
 vlc_meta_t *m_meta;
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index aecdc8e353..98b1d6c61a 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -92,6 +92,7 @@ intf_sys_t::intf_sys_t(vlc_object_t * const p_this, int port, 
std::string device
  , m_mediaSessionId( 0 )
  , m_communication( p_this, device_addr.c_str(), device_port )
  , m_state( Authenticating )
+ , m_request_stop( false )
  , m_eof( false )
  , m_meta( NULL )
  , m_ctl_thread_interrupt(p_interrupt)
@@ -269,6 +270,8 @@ void intf_sys_t::setHasInput( const std::string mime_type )
 vlc_mutex_locker locker(&m_lock);
 msg_Dbg( m_module, "Loading content" );
 
+m_request_stop = false;
+
 this->m_mime = mime_type;
 
 /* new input: clear message queue */
@@ -604,7 +607,13 @@ void intf_sys_t::processMediaMessage( const 
castchannel::CastMessage& msg )
 msg_Dbg( m_module, "New mediaSessionId: %" PRId64, 
m_mediaSessionId );
 }
 
-if (newPlayerState == "PLAYING")
+if (m_request_stop)
+{
+m_request_stop = false;
+m_communication.msgPlayerStop( m_appTransportId, 
m_mediaSessionId );
+setState( Stopping );
+}
+else if (newPlayerState == "PLAYING")
 {
 msg_Dbg( m_module, "Playback started now:%" PRId64 " 
i_ts_local_start:%" PRId64,
  m_time_playback_started, m_ts_local_start);
@@ -790,8 +799,15 @@ void intf_sys_t::requestPlayerStop()
 m_art_stream = NULL;
 }
 
-if ( m_mediaSessionId == 0 || m_state == TakenOver )
+if ( m_state == TakenOver )
 return;
+
+if ( m_mediaSessionId == 0 )
+{
+m_request_stop = true;
+return;
+}
+
 queueMessage( Stop );
 }
 

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

[vlc-commits] hw:d3d11: filter the correct part of the picture

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
15:07:53 2018 +0100| [c9804755bd83af7037e9afebe8dd4da3b1e61e46] | committer: 
Jean-Baptiste Kempf

hw:d3d11: filter the correct part of the picture

The source and destination may have different padding, so we need to ensure
we copy to/from the right area.

Fixes #19601

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

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

 modules/hw/d3d11/d3d11_filters.c | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index e835142ef9..7a47891435 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -137,7 +137,8 @@ static bool ApplyFilter( filter_sys_t *p_sys,
  D3D11_VIDEO_PROCESSOR_FILTER filter,
  const struct filter_level *p_level,
  ID3D11VideoProcessorInputView *input,
- ID3D11VideoProcessorOutputView *output )
+ ID3D11VideoProcessorOutputView *output,
+ const video_format_t *fmt)
 {
 HRESULT hr;
 
@@ -152,6 +153,16 @@ static bool ApplyFilter( filter_sys_t *p_sys,
  TRUE,
  level);
 
+RECT srcRect;
+srcRect.left   = fmt->i_x_offset;
+srcRect.top= fmt->i_y_offset;
+srcRect.right  = srcRect.left + fmt->i_visible_width;
+srcRect.bottom = srcRect.top  + fmt->i_visible_height;
+ID3D11VideoContext_VideoProcessorSetStreamSourceRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,
+ 0, TRUE, &srcRect);
+ID3D11VideoContext_VideoProcessorSetStreamDestRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,
+   0, TRUE, &srcRect);
+
 D3D11_VIDEO_PROCESSOR_STREAM stream = {0};
 stream.Enable = TRUE;
 stream.pInputSurface = input;
@@ -256,7 +267,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* contrast */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST, &p_sys->Contrast,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;
@@ -264,7 +275,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* brightness */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS, 
&p_sys->Brightness,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;
@@ -272,7 +283,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* hue */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_HUE, &p_sys->Hue,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;
@@ -280,7 +291,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* saturation */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_SATURATION, 
&p_sys->Saturation,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;

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

[vlc-commits] twitch.lua: Use VLCs client ID

2018-02-05 Thread Marvin Scholz

vlc/vlc-3.0 | branch: master | Marvin Scholz  | Sun Feb  4 
14:54:37 2018 +0100| [da906da04c87cffc8c3db642ec5f4089b203fc39] | committer: 
Jean-Baptiste Kempf

twitch.lua: Use VLCs client ID

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

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

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

diff --git a/share/lua/playlist/twitch.lua b/share/lua/playlist/twitch.lua
index 3da00d445a..c4c8d5fe36 100644
--- a/share/lua/playlist/twitch.lua
+++ b/share/lua/playlist/twitch.lua
@@ -58,7 +58,7 @@ end
 -- Make a request to the Twitch API endpoint given by url
 -- Returns: obj, err
 function twitch_api_req(url)
-local obj, pos, err = parse_json(url .. 
"?client_id=jzkbprff40iqj646a697cyrvl0zt2m6")
+local obj, pos, err = parse_json(url .. 
"?client_id=1ht9oitznxzdo3agmdbn3dydbm06q2")
 
 if err then
 return nil, "Error getting JSON object: " .. err

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

[vlc-commits] demux:mkv: don't attempt to seek to a cluster position when we don't know any

2018-02-05 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Mon Feb  5 
18:40:42 2018 +0100| [a960473ef59f359537ff3bfe43c40d5df79fb27f] | committer: 
Jean-Baptiste Kempf

demux:mkv: don't attempt to seek to a cluster position when we don't know any

This issue is not reproducible on master, therefore it is only in 3.0

Fixes: CD a8c03f5d-9a39-4d91-b0e5-80fe52740cac

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/demux/mkv/matroska_segment_seeker.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/demux/mkv/matroska_segment_seeker.cpp 
b/modules/demux/mkv/matroska_segment_seeker.cpp
index 13bc8f157f..d231d03590 100644
--- a/modules/demux/mkv/matroska_segment_seeker.cpp
+++ b/modules/demux/mkv/matroska_segment_seeker.cpp
@@ -462,6 +462,7 @@ SegmentSeeker::mkv_jump_to( matroska_segment_c& ms, fptr_t 
fpos )
 fptr_t i_cluster_pos = -1;
 ms.cluster = NULL;
 
+if (!_cluster_positions.empty())
 {
 cluster_positions_t::iterator cluster_it = greatest_lower_bound(
   _cluster_positions.begin(), _cluster_positions.end(), fpos

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

[vlc-commits] HTTP win32: use http-proxy options to setup the proxy

2018-02-05 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Fri Feb  2 
17:22:18 2018 +0100| [6514ed051d579972f21949be3900a48d8d62c647] | committer: 
Jean-Baptiste Kempf

HTTP win32: use http-proxy options to setup the proxy

Because win32/netconf is not ready

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

 modules/access/http.c | 15 ---
 src/libvlc-module.c   | 22 ++
 src/win32/netconf.c   | 30 --
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/modules/access/http.c b/modules/access/http.c
index 8d050bdec6..f5b4eacbd1 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -56,16 +56,6 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define PROXY_TEXT N_("HTTP proxy")
-#define PROXY_LONGTEXT N_( \
-"HTTP proxy to be used It must be of the form " \
-"http://[user@]myproxy.mydomain:myport/ ; " \
-"if empty, the http_proxy environment variable will be tried." )
-
-#define PROXY_PASS_TEXT N_("HTTP proxy password")
-#define PROXY_PASS_LONGTEXT N_( \
-"If your HTTP proxy requires a password, set it here." )
-
 #define RECONNECT_TEXT N_("Auto re-connect")
 #define RECONNECT_LONGTEXT N_( \
 "Automatically try to reconnect to the stream in case of a sudden " \
@@ -78,11 +68,6 @@ vlc_module_begin ()
 set_category( CAT_INPUT )
 set_subcategory( SUBCAT_INPUT_ACCESS )
 
-add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
-false )
-add_password( "http-proxy-pwd", NULL,
-  PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
-add_obsolete_bool( "http-use-IE-proxy" )
 add_bool( "http-reconnect", false, RECONNECT_TEXT,
   RECONNECT_LONGTEXT, true )
 /* 'itpc' = iTunes Podcast */
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 9d29d24b4e..77ab8283ab 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -844,6 +844,16 @@ static const char *const ppsz_prefres[] = {
 #define KEY_LONGTEXT N_( \
"This private key file (PEM format) is used for server-side TLS.")
 
+#define PROXY_TEXT N_("HTTP proxy")
+#define PROXY_LONGTEXT N_( \
+"HTTP proxy to be used It must be of the form " \
+"http://[user@]myproxy.mydomain:myport/ ; " \
+"if empty, the http_proxy environment variable will be tried." )
+
+#define PROXY_PASS_TEXT N_("HTTP proxy password")
+#define PROXY_PASS_LONGTEXT N_( \
+"If your HTTP proxy requires a password, set it here." )
+
 #define SOCKS_SERVER_TEXT N_("SOCKS server")
 #define SOCKS_SERVER_LONGTEXT N_( \
 "SOCKS proxy server to use. This must be of the form " \
@@ -1802,6 +1812,18 @@ vlc_module_begin ()
 add_obsolete_string( "http-crl" ) /* since 3.0.0 */
 add_obsolete_string( "sout-http-crl" ) /* since 2.0.0 */
 
+#ifdef _WIN32
+add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
+false )
+add_password( "http-proxy-pwd", NULL,
+  PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
+#else
+add_obsolete_string( "http-proxy" )
+add_obsolete_string( "http-proxy-pwd" )
+
+#endif
+add_obsolete_bool( "http-use-IE-proxy" )
+
 set_section( N_( "Socks proxy") , NULL )
 add_string( "socks", NULL,
  SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, true )
diff --git a/src/win32/netconf.c b/src/win32/netconf.c
index accdddf2ce..3a6dcda1ea 100644
--- a/src/win32/netconf.c
+++ b/src/win32/netconf.c
@@ -27,10 +27,36 @@
 
 #include 
 #include 
+#include 
 
-char *vlc_getProxyUrl(const char *url)
+char *vlc_getProxyUrl(const char *psz_url)
 {
-char *proxy_url = NULL;
+VLC_UNUSED(psz_url);
+
+char *proxy = config_GetPsz( (vlc_object_t *)(NULL), "http-proxy" );
+if (proxy == NULL)
+return NULL;
+
+char *proxy_pwd = config_GetPsz( (vlc_object_t *)(NULL), "http-proxy-pwd" 
);
+if (proxy_pwd == NULL)
+return proxy;
+
+vlc_url_t url;
+if (vlc_UrlParse(&url, proxy) < 0) {
+free (proxy);
+free (proxy_pwd);
+return NULL;
+}
+
+if (url.psz_password == NULL )
+url.psz_password = vlc_uri_encode(proxy_pwd);
+
+char *proxy_url = vlc_uri_compose (&url);
+vlc_UrlClean (&url);
+
+free (proxy_pwd);
+free (proxy);
+
 #if 0
 /* Try to get the proxy server address from Windows internet settings. */
 HKEY h_key;

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

[vlc-commits] chromecast: compilation fix

2018-02-05 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Feb  5 18:59:50 
2018 +0100| [34f2246a7e4b1d95b3ae7469038a82527c6ad3a0] | committer: Felix Paul 
Kühne

chromecast: compilation fix

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

 modules/stream_out/chromecast/chromecast.h| 2 +-
 modules/stream_out/chromecast/chromecast_ctrl.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast.h 
b/modules/stream_out/chromecast/chromecast.h
index 97123967be..4f0ecd9300 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -165,7 +165,7 @@ struct intf_sys_t
 bool isFinishedPlaying();
 
 void setHasInput(const std::string mime_type = "");
-bool isStatePlaying() const;
+bool isPlaying() const;
 
 void requestPlayerSeek(mtime_t pos);
 void requestPlayerStop();
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 13f406f901..dad14c0334 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -839,7 +839,7 @@ States intf_sys_t::state() const
 void intf_sys_t::requestPlayerSeek(mtime_t pos)
 {
 vlc_mutex_locker locker(&m_lock);
-if( !isStatePlaying() || m_mediaSessionId == 0 )
+if( !isPlaying() || m_mediaSessionId == 0 )
 return;
 if ( pos != VLC_TS_INVALID )
 m_ts_local_start = pos;

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

[vlc-commits] d3d9_filters: fix a potential crash

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 18:44:30 
2018 +0100| [480e9c862606f45095d45f2869e890c0251a11ea] | committer: Steve Lhomme

d3d9_filters: fix a potential crash

This can happen if more than one filter is used. There is not enough in this 
cases the
picture is created in CPU, not from the GPU pool and it fails.

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

 modules/hw/d3d9/d3d9_filters.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/hw/d3d9/d3d9_filters.c b/modules/hw/d3d9/d3d9_filters.c
index 82a921d2fa..7f565c2de4 100644
--- a/modules/hw/d3d9/d3d9_filters.c
+++ b/modules/hw/d3d9/d3d9_filters.c
@@ -107,7 +107,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 picture_sys_t *p_src_sys = ActivePictureSys(p_pic);
 
 picture_t *p_outpic = filter_NewPicture( p_filter );
-if( !p_outpic )
+if( !p_outpic || !p_outpic->p_sys->surface )
 goto failed;
 
 picture_CopyProperties( p_outpic, p_pic );

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

[vlc-commits] direct3d9: use a different vout for HDR content if possible

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 18:01:31 
2018 +0100| [3c667badb4119dd1a4fe5a686c6a378fb8f92795] | committer: Steve Lhomme

direct3d9: use a different vout for HDR content if possible

Similar to what we do with 360 videos.

It should fallback to OpenGL on Win7.

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

 modules/video_output/win32/direct3d9.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/video_output/win32/direct3d9.c 
b/modules/video_output/win32/direct3d9.c
index 71b517a59d..d60e92e7ed 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -248,6 +248,9 @@ static int Open(vlc_object_t *object)
 if ( !vd->obj.force && vd->source.projection_mode != 
PROJECTION_MODE_RECTANGULAR)
 return VLC_EGENERIC; /* let a module who can handle it do it */
 
+if ( !vd->obj.force && vd->source.mastering.max_luminance != 0)
+return VLC_EGENERIC; /* let a module who can handle it do it */
+
 OSVERSIONINFO winVer;
 winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 if(GetVersionEx(&winVer) && winVer.dwMajorVersion < 6 && 
!object->obj.force)

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

[vlc-commits] chromecast: don't send stop/seek msg when not playing

2018-02-05 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Mon Feb  5 18:09:44 
2018 +0100| [a152ac94d03f2bd24e224cf1444062b18f3b24ec] | committer: Thomas 
Guillem

chromecast: don't send stop/seek msg when not playing

This fixes inconsistent states when the cc is already stopped.

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

 modules/stream_out/chromecast/chromecast.h|  1 +
 modules/stream_out/chromecast/chromecast_ctrl.cpp | 41 +--
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast.h 
b/modules/stream_out/chromecast/chromecast.h
index b477d2a578..97123967be 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -165,6 +165,7 @@ struct intf_sys_t
 bool isFinishedPlaying();
 
 void setHasInput(const std::string mime_type = "");
+bool isStatePlaying() const;
 
 void requestPlayerSeek(mtime_t pos);
 void requestPlayerStop();
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 98b1d6c61a..13f406f901 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -297,6 +297,21 @@ void intf_sys_t::setHasInput( const std::string mime_type )
 m_eof = false;
 }
 
+bool intf_sys_t::isPlaying() const
+{
+switch( m_state )
+{
+case Loading:
+case Buffering:
+case Playing:
+case Paused:
+case Seeking:
+return true;
+default:
+return false;
+}
+}
+
 /**
  * @brief Process a message received from the Chromecast
  * @param msg the CastMessage to process
@@ -367,11 +382,21 @@ void intf_sys_t::mainLoop()
 switch ( msg )
 {
 case Stop:
-m_communication.msgPlayerStop( m_appTransportId, 
m_mediaSessionId );
-setState( Stopping );
+if( isPlaying() )
+{
+if ( m_mediaSessionId == 0 )
+m_request_stop = true;
+else
+{
+m_communication.msgPlayerStop( m_appTransportId, 
m_mediaSessionId );
+setState( Stopping );
+}
+}
 break;
 case Seek:
 {
+if( !isPlaying() || m_mediaSessionId == 0 )
+break;
 char current_time[32];
 mtime_t seek_request_time = mdate() + SEEK_FORWARD_OFFSET;
 if( snprintf( current_time, sizeof(current_time), "%.3f",
@@ -799,15 +824,9 @@ void intf_sys_t::requestPlayerStop()
 m_art_stream = NULL;
 }
 
-if ( m_state == TakenOver )
+if( !isPlaying() )
 return;
 
-if ( m_mediaSessionId == 0 )
-{
-m_request_stop = true;
-return;
-}
-
 queueMessage( Stop );
 }
 
@@ -820,7 +839,7 @@ States intf_sys_t::state() const
 void intf_sys_t::requestPlayerSeek(mtime_t pos)
 {
 vlc_mutex_locker locker(&m_lock);
-if ( m_mediaSessionId == 0 )
+if( !isStatePlaying() || m_mediaSessionId == 0 )
 return;
 if ( pos != VLC_TS_INVALID )
 m_ts_local_start = pos;
@@ -860,7 +879,7 @@ void intf_sys_t::waitAppStarted()
 m_state = Launching;
 m_communication.msgReceiverLaunchApp();
 }
-msg_Dbg( m_module, "Waiting for Chromecast media receiver app to be 
ready" );
+msg_Info( m_module, "Waiting for Chromecast media receiver app to be 
ready: %d", m_state );
 vlc_cond_wait(&m_stateChangedCond, &m_lock);
 }
 msg_Dbg( m_module, "Done waiting for application. transportId: %s", 
m_appTransportId.c_str() );

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

[vlc-commits] direct3d11: fix the log when the I420 pool is used

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 18:10:14 
2018 +0100| [88cf434bbaae2231f2d7605ad058b7d585056a78] | committer: Steve Lhomme

direct3d11: fix the log when the I420 pool is used

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

 modules/video_output/win32/direct3d11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 4a4887c7d9..f3f220f326 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -689,7 +689,7 @@ error:
 sys->sys.pool = picture_pool_NewExtended( &pool_cfg );
 } else {
 msg_Dbg(vd, "D3D11 pool succeed with %d surfaces (%dx%d) context 0x%p",
-picture_count, surface_fmt.i_width, surface_fmt.i_height, 
sys->d3d_dev.d3dcontext);
+pool_size, surface_fmt.i_width, surface_fmt.i_height, 
sys->d3d_dev.d3dcontext);
 }
 return sys->sys.pool;
 }

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

[vlc-commits] direct3d11: log the sampler as well

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 18:10:33 
2018 +0100| [b8d583fe6855fc36bab577c75a07ed4c98cfb22f] | committer: Steve Lhomme

direct3d11: log the sampler as well

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

 modules/video_output/win32/direct3d11.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index f3f220f326..949419fcfe 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1945,6 +1945,7 @@ static HRESULT CompilePixelShader(vout_display_t *vd, 
const d3d_format_t *format
 msg_Dbg(vd,"psz_peak_luminance %s", psz_peak_luminance);
 msg_Dbg(vd,"psz_display_transform %s", psz_display_transform);
 msg_Dbg(vd,"psz_adjust_range %s", psz_adjust_range);
+msg_Dbg(vd,"psz_sampler %s", psz_sampler);
 }
 #endif
 free(psz_range);

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

[vlc-commits] dxgi_fmt: favor BGRA over RGBA

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 18:12:48 
2018 +0100| [4195c8eabb224f61ad1fbb9ae346a2be690d7f2a] | committer: Steve Lhomme

dxgi_fmt: favor BGRA over RGBA

That's the format you get when capturing the screen in D3D11. So it's likely
the internal format.

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

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

diff --git a/modules/video_chroma/dxgi_fmt.c b/modules/video_chroma/dxgi_fmt.c
index 1a0ba9e044..384c6b599b 100644
--- a/modules/video_chroma/dxgi_fmt.c
+++ b/modules/video_chroma/dxgi_fmt.c
@@ -79,10 +79,10 @@ static const d3d_format_t d3d_formats[] = {
 { "NV11", DXGI_FORMAT_NV11,   VLC_CODEC_I411,  8, 4, 
1, { DXGI_FORMAT_R8_UNORM,   DXGI_FORMAT_R8G8_UNORM} },
 #endif
 { "I420", DXGI_FORMAT_UNKNOWN,VLC_CODEC_I420,  8, 2, 
2, { DXGI_FORMAT_R8_UNORM,  DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_UNORM } },
-{ "R8G8B8A8", DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_RGBA,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
-{ "VA_RGBA",  DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_D3D11_OPAQUE,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
 { "B8G8R8A8", DXGI_FORMAT_B8G8R8A8_UNORM, VLC_CODEC_BGRA,  8, 1, 
1, { DXGI_FORMAT_B8G8R8A8_UNORM } },
 { "VA_BGRA",  DXGI_FORMAT_B8G8R8A8_UNORM, VLC_CODEC_D3D11_OPAQUE,  8, 1, 
1, { DXGI_FORMAT_B8G8R8A8_UNORM } },
+{ "R8G8B8A8", DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_RGBA,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
+{ "VA_RGBA",  DXGI_FORMAT_R8G8B8A8_UNORM, VLC_CODEC_D3D11_OPAQUE,  8, 1, 
1, { DXGI_FORMAT_R8G8B8A8_UNORM } },
 { "R8G8B8X8", DXGI_FORMAT_B8G8R8X8_UNORM, VLC_CODEC_RGB32, 8, 1, 
1, { DXGI_FORMAT_B8G8R8X8_UNORM } },
 { "B5G6R5",   DXGI_FORMAT_B5G6R5_UNORM,   VLC_CODEC_RGB16, 5, 1, 
1, { DXGI_FORMAT_B5G6R5_UNORM } },
 { "I420_OPAQUE", DXGI_FORMAT_420_OPAQUE,  VLC_CODEC_D3D11_OPAQUE,  8, 2, 
2, { DXGI_FORMAT_UNKNOWN } },

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

[vlc-commits] chromecast: postpone stop when loading

2018-02-05 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Mon Feb  5 17:31:52 
2018 +0100| [3b1359ae207eb9e473f4225b454177a54d8360c0] | committer: Thomas 
Guillem

chromecast: postpone stop when loading

The cc on the nvidia shield can buffer a lot before sending a Buffering/Playing
event. If you stopped during this period (m_mediaSessionId=0), the cc could
play around 5 seconds of video/sound before draining its buffers.

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

 modules/stream_out/chromecast/chromecast.h|  1 +
 modules/stream_out/chromecast/chromecast_ctrl.cpp | 20 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast.h 
b/modules/stream_out/chromecast/chromecast.h
index cad32ebbb1..b477d2a578 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -234,6 +234,7 @@ private:
 ChromecastCommunication m_communication;
 std::queue m_msgQueue;
 States m_state;
+bool m_request_stop;
 bool m_eof;
 
 vlc_meta_t *m_meta;
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index aecdc8e353..98b1d6c61a 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -92,6 +92,7 @@ intf_sys_t::intf_sys_t(vlc_object_t * const p_this, int port, 
std::string device
  , m_mediaSessionId( 0 )
  , m_communication( p_this, device_addr.c_str(), device_port )
  , m_state( Authenticating )
+ , m_request_stop( false )
  , m_eof( false )
  , m_meta( NULL )
  , m_ctl_thread_interrupt(p_interrupt)
@@ -269,6 +270,8 @@ void intf_sys_t::setHasInput( const std::string mime_type )
 vlc_mutex_locker locker(&m_lock);
 msg_Dbg( m_module, "Loading content" );
 
+m_request_stop = false;
+
 this->m_mime = mime_type;
 
 /* new input: clear message queue */
@@ -604,7 +607,13 @@ void intf_sys_t::processMediaMessage( const 
castchannel::CastMessage& msg )
 msg_Dbg( m_module, "New mediaSessionId: %" PRId64, 
m_mediaSessionId );
 }
 
-if (newPlayerState == "PLAYING")
+if (m_request_stop)
+{
+m_request_stop = false;
+m_communication.msgPlayerStop( m_appTransportId, 
m_mediaSessionId );
+setState( Stopping );
+}
+else if (newPlayerState == "PLAYING")
 {
 msg_Dbg( m_module, "Playback started now:%" PRId64 " 
i_ts_local_start:%" PRId64,
  m_time_playback_started, m_ts_local_start);
@@ -790,8 +799,15 @@ void intf_sys_t::requestPlayerStop()
 m_art_stream = NULL;
 }
 
-if ( m_mediaSessionId == 0 || m_state == TakenOver )
+if ( m_state == TakenOver )
 return;
+
+if ( m_mediaSessionId == 0 )
+{
+m_request_stop = true;
+return;
+}
+
 queueMessage( Stop );
 }
 

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

[vlc-commits] demux: mp4: fix sample agregation v0 compressed audio

2018-02-05 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Mon Feb  
5 16:52:18 2018 +0100| [c86f2bcbd5d9a31290a59c63b30cba831ef3ce6d] | committer: 
Francois Cartegnie

demux: mp4: fix sample agregation v0 compressed audio

(cherry picked from commit 86de6e31817c77d28359c58fcf224ec239b592cf)

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

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

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index ef7513f5f3..7be3ffc481 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3720,8 +3720,12 @@ static uint32_t MP4_TrackGetReadSize( mp4_track_t 
*p_track, uint32_t *pi_nb_samp
 case VLC_CODEC_MPGA:
 case VLC_CODEC_MP2:
 case VLC_CODEC_MP3:
+case VLC_CODEC_DTS:
+case VLC_CODEC_MP4A:
+case VLC_CODEC_A52:
 i_max_v0_samples = 1;
 break;
+/* fixme, reverse using a list of uncompressed codecs */
 default:
 /* Read 25ms of samples (uncompressed) */
 i_max_v0_samples = p_track->fmt.audio.i_rate / 40 *

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

[vlc-commits] demux: mp4: fix sample agregation v0 compressed audio

2018-02-05 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Mon Feb  5 
16:52:18 2018 +0100| [86de6e31817c77d28359c58fcf224ec239b592cf] | committer: 
Francois Cartegnie

demux: mp4: fix sample agregation v0 compressed audio

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

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

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 85ed65b702..06ae1ff2f3 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3793,8 +3793,12 @@ static uint32_t MP4_TrackGetReadSize( mp4_track_t 
*p_track, uint32_t *pi_nb_samp
 case VLC_CODEC_MPGA:
 case VLC_CODEC_MP2:
 case VLC_CODEC_MP3:
+case VLC_CODEC_DTS:
+case VLC_CODEC_MP4A:
+case VLC_CODEC_A52:
 i_max_v0_samples = 1;
 break;
+/* fixme, reverse using a list of uncompressed codecs */
 default:
 /* Read 25ms of samples (uncompressed) */
 i_max_v0_samples = p_track->fmt.audio.i_rate / 40 *

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

[vlc-commits] hw:d3d11: filter the correct part of the picture

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 15:07:53 
2018 +0100| [7c92309e654c4d8310ced9bb342c334f38156f69] | committer: Steve Lhomme

hw:d3d11: filter the correct part of the picture

The source and destination may have different padding, so we need to ensure
we copy to/from the right area.

Fixes #19601

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

 modules/hw/d3d11/d3d11_filters.c | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index 9ebc12deb7..643ab7ffd8 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -137,7 +137,8 @@ static bool ApplyFilter( filter_sys_t *p_sys,
  D3D11_VIDEO_PROCESSOR_FILTER filter,
  const struct filter_level *p_level,
  ID3D11VideoProcessorInputView *input,
- ID3D11VideoProcessorOutputView *output )
+ ID3D11VideoProcessorOutputView *output,
+ const video_format_t *fmt)
 {
 HRESULT hr;
 
@@ -152,6 +153,16 @@ static bool ApplyFilter( filter_sys_t *p_sys,
  TRUE,
  level);
 
+RECT srcRect;
+srcRect.left   = fmt->i_x_offset;
+srcRect.top= fmt->i_y_offset;
+srcRect.right  = srcRect.left + fmt->i_visible_width;
+srcRect.bottom = srcRect.top  + fmt->i_visible_height;
+ID3D11VideoContext_VideoProcessorSetStreamSourceRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,
+ 0, TRUE, &srcRect);
+ID3D11VideoContext_VideoProcessorSetStreamDestRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,
+   0, TRUE, &srcRect);
+
 D3D11_VIDEO_PROCESSOR_STREAM stream = {0};
 stream.Enable = TRUE;
 stream.pInputSurface = input;
@@ -256,7 +267,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* contrast */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST, &p_sys->Contrast,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;
@@ -264,7 +275,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* brightness */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS, 
&p_sys->Brightness,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;
@@ -272,7 +283,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* hue */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_HUE, &p_sys->Hue,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;
@@ -280,7 +291,7 @@ static picture_t *Filter(filter_t *p_filter, picture_t 
*p_pic)
 /* saturation */
 if ( ApplyFilter( p_sys,
   D3D11_VIDEO_PROCESSOR_FILTER_SATURATION, 
&p_sys->Saturation,
-  inputs[idx], outputs[idx] ) )
+  inputs[idx], outputs[idx], &p_filter->fmt_out.video ) )
 {
 idx++;
 count++;

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

[vlc-commits] hw:d3d11: deinterlace: adjust the deinterlaced area if there is an offset

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 15:10:00 
2018 +0100| [10db447e00201dc557998aa2d73e4aabaa1f1332] | committer: Steve Lhomme

hw:d3d11: deinterlace: adjust the deinterlaced area if there is an offset

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

 modules/hw/d3d11/d3d11_deinterlace.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hw/d3d11/d3d11_deinterlace.c 
b/modules/hw/d3d11/d3d11_deinterlace.c
index b52f76072c..91d26cf912 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -185,10 +185,10 @@ static int RenderPic( filter_t *p_filter, picture_t 
*p_outpic, picture_t *p_pic,
 }
 
 RECT srcRect;
-srcRect.left = 0;
-srcRect.top = 0;
-srcRect.right  = p_pic->format.i_visible_width;
-srcRect.bottom = p_pic->format.i_visible_height;
+srcRect.left   = p_pic->format.i_x_offset;
+srcRect.top= p_pic->format.i_y_offset;
+srcRect.right  = srcRect.left + p_pic->format.i_visible_width;
+srcRect.bottom = srcRect.top  + p_pic->format.i_visible_height;
 ID3D11VideoContext_VideoProcessorSetStreamSourceRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,
  0, TRUE, &srcRect);
 ID3D11VideoContext_VideoProcessorSetStreamDestRect(p_sys->d3dvidctx, 
p_sys->videoProcessor,

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

[vlc-commits] chroma:copy: use the proper defines to access the planes in picture_SwapUV()

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 14:17:09 
2018 +0100| [c8746a49d8b95ba4c29af0047ce9f75dd5de1dc9] | committer: Steve Lhomme

chroma:copy: use the proper defines to access the planes in picture_SwapUV()

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

 modules/video_chroma/copy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_chroma/copy.c b/modules/video_chroma/copy.c
index 35721ebc93..626dc34f05 100644
--- a/modules/video_chroma/copy.c
+++ b/modules/video_chroma/copy.c
@@ -832,9 +832,9 @@ void picture_SwapUV(picture_t *picture)
 {
 assert(picture->i_planes == 3);
 
-plane_t tmp_plane = picture->p[1];
-picture->p[1] = picture->p[2];
-picture->p[2] = tmp_plane;
+plane_t tmp_plane   = picture->p[U_PLANE];
+picture->p[U_PLANE] = picture->p[V_PLANE];
+picture->p[V_PLANE] = tmp_plane;
 }
 
 int picture_UpdatePlanes(picture_t *picture, uint8_t *data, unsigned pitch)

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

[vlc-commits] hw:d3d9: no need to swap the planes when running the external converter

2018-02-05 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Mon Feb  5 13:54:14 
2018 +0100| [4e35c662b5218cf065b276e89ac571271b665a4c] | committer: Steve Lhomme

hw:d3d9: no need to swap the planes when running the external converter

It's already taking care of the proper plane swapping.

Fixes #19482 (without breaking #19543)

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

 modules/hw/d3d9/dxa9.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index 3aac41dda6..92dd872b32 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -257,11 +257,7 @@ static void YV12_D3D9(filter_t *p_filter, picture_t *src, 
picture_t *dst)
 
 picture_Hold( src );
 
-if (src->format.i_chroma == VLC_CODEC_I420)
-plane_SwapUV( src->p );
 sys->filter->pf_video_filter(sys->filter, src);
-if (src->format.i_chroma == VLC_CODEC_I420)
-plane_SwapUV( src->p );
 
 IDirect3DSurface9_UnlockRect(sys->staging->p_sys->surface);
 

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

[vlc-commits] chromecast: fix pause command never sent

2018-02-05 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Mon Feb  5 
13:52:59 2018 +0100| [1ed02dc368bf5e143349a3f23146b0203d0f4da4] | committer: 
Thomas Guillem

chromecast: fix pause command never sent

Regression from d28be9f17aeeb86cac0f5b3d99d6fd39c6665d6f

(cherry picked from commit 0171ebada4f93ecc97e142ac54e55f32e0306700)
Signed-off-by: Thomas Guillem 

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

 modules/stream_out/chromecast/chromecast_ctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 0746604d0f..aecdc8e353 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -817,14 +817,14 @@ void intf_sys_t::setPauseState(bool paused)
 vlc_mutex_locker locker( &m_lock );
 if ( !paused )
 {
-if ( m_mediaSessionId == 0 )
+if ( m_mediaSessionId != 0 )
 {
 m_communication.msgPlayerPlay( m_appTransportId, m_mediaSessionId 
);
 }
 }
 else
 {
-if ( m_mediaSessionId == 0 && m_state != Paused )
+if ( m_mediaSessionId != 0 && m_state != Paused )
 {
 m_communication.msgPlayerPause( m_appTransportId, m_mediaSessionId 
);
 }

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

[vlc-commits] chromecast: fix pause command never sent

2018-02-05 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Mon Feb  5 13:52:59 
2018 +0100| [0171ebada4f93ecc97e142ac54e55f32e0306700] | committer: Thomas 
Guillem

chromecast: fix pause command never sent

Regression from d28be9f17aeeb86cac0f5b3d99d6fd39c6665d6f

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

 modules/stream_out/chromecast/chromecast_ctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp 
b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 0746604d0f..aecdc8e353 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -817,14 +817,14 @@ void intf_sys_t::setPauseState(bool paused)
 vlc_mutex_locker locker( &m_lock );
 if ( !paused )
 {
-if ( m_mediaSessionId == 0 )
+if ( m_mediaSessionId != 0 )
 {
 m_communication.msgPlayerPlay( m_appTransportId, m_mediaSessionId 
);
 }
 }
 else
 {
-if ( m_mediaSessionId == 0 && m_state != Paused )
+if ( m_mediaSessionId != 0 && m_state != Paused )
 {
 m_communication.msgPlayerPause( m_appTransportId, m_mediaSessionId 
);
 }

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

[vlc-commits] tls: fix the way to ignore CA check

2018-02-05 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Mon Feb  5 
10:41:24 2018 +0100| [5d27e15cb1ad0e72b5dd5c48bd33ba429b53ec6a] | committer: 
Thomas Guillem

tls: fix the way to ignore CA check

You had one job...

see 0d8b5004b5df9b235a945da00eec50163a5e8e5c and
1c24e8b96435c1e438653c4fa017634072ca99cf

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

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

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 57429a0b99..1b214358d4 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -445,7 +445,8 @@ static int gnutls_ClientHandshake(vlc_tls_creds_t *creds, 
vlc_tls_t *tls,
 gnutls_free (desc.data);
 }
 
-if (status == (GNUTLS_CERT_SIGNER_NOT_FOUND | GNUTLS_CERT_INVALID) &&
+const unsigned status_insecure = GNUTLS_CERT_SIGNER_NOT_FOUND | 
GNUTLS_CERT_INVALID;
+if ((status & status_insecure) == status_insecure &&
 (creds->obj.flags & OBJECT_FLAGS_INSECURE))
 {
 msg_Info( creds, "Accepting self-signed/untrusted CA certificate." );

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

58 matches

Mail list logo