Commit 7b2a3cd0 authored by GitLab CI's avatar GitLab CI

Merge remote-tracking branch 'upstream/master' into master-build

* upstream/master:
  WinGui: Another update of the translations.
  preset: fix NULL initializtion of subtitle name
  contrib: Update to FFmpeg 4.2.
parents 84026247 9d610250
From 4361293fcf59edb56879c36edcd25f0a91e0edf8 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.hsj@gmail.com>
Date: Sat, 24 Nov 2018 13:02:02 -0800
Subject: [PATCH] avutil/mem: Fix invalid use of av_alloc_size
The alloc_size attribute is valid only on functions that return a
pointer. GCC 9 (not yet released) warns about invalid usage:
./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes]
342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
| ^~~~~~~~~~~~~
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavutil/mem.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/mem.h b/libavutil/mem.h
index 55ae573ac9..5fb1a02dd9 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
* @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
* correctly aligned.
*/
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
/**
* Reallocate the given buffer if it is not large enough, otherwise do nothing.
--
2.21.0
From 5282db5929f25ca9566a47ad217794842b364afc Mon Sep 17 00:00:00 2001
From: Andriy Gelman <andriy.gelman@gmail.com>
Date: Wed, 12 Dec 2018 23:57:35 -0500
Subject: [PATCH] avcodec/mpeg: Initialize quarter_sample parameter from
previous thread.
Fixes #7410.
The value of sub-pixel precision for me/mc can change during an Intra frame. In multi-threaded decoding this change is not propagated to other frame threads causing decoding artifacts. This patch initializes the sub-pixel precision parameter from previous thread, which fixes the issue.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavcodec/mpegvideo.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index d4d3bea..dbb6ab9 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -538,6 +538,8 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
s->avctx->width = s1->avctx->width;
s->avctx->height = s1->avctx->height;
+ s->quarter_sample = s1->quarter_sample;
+
s->coded_picture_number = s1->coded_picture_number;
s->picture_number = s1->picture_number;
--
1.9.1
......@@ -12,9 +12,9 @@ endif
$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
$(eval $(call import.CONTRIB.defs,FFMPEG))
FFMPEG.FETCH.url = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.1.3.tar.bz2
FFMPEG.FETCH.url += https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2
FFMPEG.FETCH.sha256 = 29a679685bd7bc29158110f367edf67b31b451f2176f9d79d0f342b9e22d6a2a
FFMPEG.FETCH.url = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.2.tar.bz2
FFMPEG.FETCH.url += https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
FFMPEG.FETCH.sha256 = 306bde5f411e9ee04352d1d3de41bd3de986e42e2af2a4c44052dce1ada26fb8
FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.host =
......
......@@ -682,12 +682,12 @@ static void add_audio_for_lang(hb_value_array_t *list, const hb_dict_t *preset,
hb_dict_set(audio_dict, "Track", hb_value_int(track));
hb_dict_set(audio_dict, "Encoder", hb_value_string(
hb_audio_encoder_get_short_name(out_codec)));
if (hb_dict_get(encoder_dict, "AudioTrackName") != NULL)
const char * name = hb_dict_get_string(encoder_dict, "AudioTrackName");
if (name != NULL && name[0] != 0)
{
hb_dict_set(audio_dict, "Name", hb_value_dup(
hb_dict_get(encoder_dict, "AudioTrackName")));
hb_dict_set_string(audio_dict, "Name", name);
}
else if (aconfig->in.name != NULL)
else if (aconfig->in.name != NULL && aconfig->in.name[0] != 0)
{
hb_dict_set_string(audio_dict, "Name", aconfig->in.name);
}
......@@ -899,7 +899,10 @@ static void add_subtitle(hb_value_array_t *list, int track,
hb_dict_set_bool(subtitle_dict, "Default", make_default);
hb_dict_set_bool(subtitle_dict, "Forced", force);
hb_dict_set_bool(subtitle_dict, "Burn", burn);
hb_dict_set_string(subtitle_dict, "Name", name);
if (name != NULL && name[0] != 0)
{
hb_dict_set_string(subtitle_dict, "Name", name);
}
hb_value_array_append(list, subtitle_dict);
}
......
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
......@@ -60,45 +60,45 @@
: and then encoded with base64 encoding.
-->
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="type" type="xsd:string"/>
<xsd:attribute name="mimetype" type="xsd:string"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="alias" type="xsd:string"/>
<xsd:attribute name="name" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:choice>
......@@ -1020,7 +1020,7 @@ Tiempo restante: {5}, Transcurrido: {6:d\:hh\:mm\:ss}</value>
<value>iPod 5G Support</value>
</data>
<data name="MainView_MetaDataTab" xml:space="preserve">
<value>Meta Dato</value>
<value>Metadata</value>
</data>
<data name="MainView_ModifiedPreset" xml:space="preserve">
<value>(Modificado)</value>
......@@ -1140,7 +1140,7 @@ Tiempo restante: {5}, Transcurrido: {6:d\:hh\:mm\:ss}</value>
<value>Administrar ajuste preestablecido</value>
</data>
<data name="MetaDataView_Title" xml:space="preserve">
<value>Meta Datos</value>
<value>Metadata</value>
</data>
<data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
<value>Permitir el uso de los codificadores Nvidia NVENC</value>
......@@ -1698,7 +1698,7 @@ Tiempo restante: {5}, Transcurrido: {6:d\:hh\:mm\:ss}</value>
<value>Sintonizar Codificador:</value>
</data>
<data name="VideoView_ExtraOptions" xml:space="preserve">
<value>Opciones extra:</value>
<value>Advanced Options:</value>
</data>
<data name="VideoView_FastDecode" xml:space="preserve">
<value>Decodificación rápida</value>
......@@ -1993,7 +1993,7 @@ Cuando se admita, se habrán importado los ajustes preestablecidos de usuario.</
<value>Exportar Cola (CLI Solo)</value>
</data>
<data name="Options_DarkTheme" xml:space="preserve">
<value>Usa el Tema Oscuro. (Requiere reiniciar) (ESTA ES UNA VISTA PREVIA TEMPRANA. ¡AÚN NO ESTÁ ACABADA!)</value>
<value>Use the Dark Theme. (Requires Restart, Windows 10 only)</value>
</data>
<data name="QueueView_NotAvailable" xml:space="preserve">
<value>No disponible</value>
......@@ -2002,7 +2002,7 @@ Cuando se admita, se habrán importado los ajustes preestablecidos de usuario.</
<value>GB</value>
</data>
<data name="SystemService_ACMains" xml:space="preserve">
<value>Alimentación de red de AC detectada. Reanudando la codificación... ({0} %) </value>
<value>Alimentación de red de AC detectada. Reanudando la codificación... (-0- %) </value>
</data>
<data name="SystemService_CriticalBattery" xml:space="preserve">
<value>¡La batería del sistema es crítica! ({0} %)</value>
......@@ -2019,4 +2019,31 @@ Cuando se admita, se habrán importado los ajustes preestablecidos de usuario.</
<data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
<value>Configure Automatic Subtitle Selections</value>
</data>
</root>
\ No newline at end of file
<data name="Options_SystemOptions" xml:space="preserve">
<value>System</value>
</data>
<data name="MetadataView_Actors" xml:space="preserve">
<value>Actors:</value>
</data>
<data name="MetadataView_Comments" xml:space="preserve">
<value>Comments:</value>
</data>
<data name="MetadataView_Description" xml:space="preserve">
<value>Descripcion:</value>
</data>
<data name="MetadataView_Director" xml:space="preserve">
<value>Director:</value>
</data>
<data name="MetadataView_Genre" xml:space="preserve">
<value>Genre:</value>
</data>
<data name="MetadataView_Plot" xml:space="preserve">
<value>Plot:</value>
</data>
<data name="MetadataView_ReleaseDate" xml:space="preserve">
<value>Release Date:</value>
</data>
<data name="MetadataView_TitleTag" xml:space="preserve">
<value>Title:</value>
</data>
</root>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
......@@ -60,45 +60,45 @@
: and then encoded with base64 encoding.
-->
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="type" type="xsd:string"/>
<xsd:attribute name="mimetype" type="xsd:string"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="alias" type="xsd:string"/>
<xsd:attribute name="name" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
<xsd:attribute ref="xml:space"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
</xsd:choice>
......@@ -1022,7 +1022,7 @@ Souhaitez-vous l'écraser ?</value>
<value>Support iPod 5G </value>
</data>
<data name="MainView_MetaDataTab" xml:space="preserve">
<value>Métadonnées</value>
<value>Metadata</value>
</data>
<data name="MainView_ModifiedPreset" xml:space="preserve">
<value>(Modifié)</value>
......@@ -1058,7 +1058,7 @@ Souhaitez-vous l'écraser ?</value>
<value>Aperçu</value>
</data>
<data name="MainView_ProgressStatusWithTask" xml:space="preserve">
<value>Encoding: {0}, {1:00.00}%, Time Remaining: {2}, {3}</value>
<value>Encodage : {0}, {1: 00.00}%, Temps restant : {2}, {3}</value>
</data>
<data name="MainView_Range" xml:space="preserve">
<value>Intervalle :</value>
......@@ -1142,7 +1142,7 @@ Souhaitez-vous l'écraser ?</value>
<value>Gérer les préréglages</value>
</data>
<data name="MetaDataView_Title" xml:space="preserve">
<value>Métadonnées</value>
<value>Metadata</value>
</data>
<data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
<value>Autoriser l'utilisation des encodeurs Nvidia NVENC</value>
......@@ -1700,7 +1700,7 @@ Souhaitez-vous l'écraser ?</value>
<value>Réglage de l'encodeur :</value>
</data>
<data name="VideoView_ExtraOptions" xml:space="preserve">
<value>Options supplémentaires :</value>
<value>Advanced Options:</value>
</data>
<data name="VideoView_FastDecode" xml:space="preserve">
<value>Décodage Rapide</value>
......@@ -1992,7 +1992,7 @@ Là où pris en charge, tous les préréglages utilisateur auront été importé
<value>Exporter la file d'attente (CLI seulement)</value>
</data>
<data name="Options_DarkTheme" xml:space="preserve">
<value>Utilisez le thème sombre. (Nécessite un redémarrage) (CECI EST UN APERÇU ANTICIPÉ. CE N'EST PAS ENCORE FINALISÉ !)</value>
<value>Use the Dark Theme. (Requires Restart, Windows 10 only)</value>
</data>
<data name="QueueView_NotAvailable" xml:space="preserve">
<value>Indisponible</value>
......@@ -2018,4 +2018,31 @@ Là où pris en charge, tous les préréglages utilisateur auront été importé
<data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
<value>Configure Automatic Subtitle Selections</value>
</data>
</root>
\ No newline at end of file
<data name="Options_SystemOptions" xml:space="preserve">
<value>System</value>
</data>
<data name="MetadataView_Actors" xml:space="preserve">
<value>Actors:</value>
</data>
<data name="MetadataView_Comments" xml:space="preserve">
<value>Comments:</value>
</data>
<data name="MetadataView_Description" xml:space="preserve">
<value>Description :</value>
</data>
<data name="MetadataView_Director" xml:space="preserve">
<value>Director:</value>
</data>
<data name="MetadataView_Genre" xml:space="preserve">
<value>Genre:</value>
</data>
<data name="MetadataView_Plot" xml:space="preserve">
<value>Plot:</value>
</data>
<data name="MetadataView_ReleaseDate" xml:space="preserve">
<value>Release Date:</value>
</data>
<data name="MetadataView_TitleTag" xml:space="preserve">
<value>Title:</value>
</data>
</root>
......@@ -1022,7 +1022,7 @@ FPS: {3:000.0}, Сред FPS: {4:000.0}
<value>Поддержка iPod 5G</value>
</data>
<data name="MainView_MetaDataTab" xml:space="preserve">
<value>Мета Данные</value>
<value>Metadata</value>
</data>
<data name="MainView_ModifiedPreset" xml:space="preserve">
<value>(Измененный)</value>
......@@ -1142,7 +1142,7 @@ FPS: {3:000.0}, Сред FPS: {4:000.0}
<value>Упрявлять Пресетами</value>
</data>
<data name="MetaDataView_Title" xml:space="preserve">
<value>Мета Данные</value>
<value>Metadata</value>
</data>
<data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
<value>Разрешить использовать кодировщики Nvidia NVENC</value>
......@@ -1700,7 +1700,7 @@ FPS: {3:000.0}, Сред FPS: {4:000.0}
<value>Настройка кодировщика:</value>
</data>
<data name="VideoView_ExtraOptions" xml:space="preserve">
<value>Экстра Опции:</value>
<value>Advanced Options:</value>
</data>
<data name="VideoView_FastDecode" xml:space="preserve">
<value>Быстрое Декодирование</value>
......@@ -1991,7 +1991,7 @@ Time Remaining: {5:hh\:mm\:ss}, Elapsed: {6:hh\:mm\:ss} {7}</value>
<value>Экспортировать очередь (только для интерфейса командной строки - CLI)</value>
</data>
<data name="Options_DarkTheme" xml:space="preserve">
<value>Использовать Темную тему. (необходим перезапуск) (РАНЕЕ ПРЕВЬЮ. ФУНКЦИЯ ЕЩЕ НЕ ЗАВЕРШЕНА!)</value>
<value>Use the Dark Theme. (Requires Restart, Windows 10 only)</value>
</data>
<data name="QueueView_NotAvailable" xml:space="preserve">
<value>Not Available</value>
......@@ -2017,4 +2017,31 @@ Time Remaining: {5:hh\:mm\:ss}, Elapsed: {6:hh\:mm\:ss} {7}</value>
<data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
<value>Configure Automatic Subtitle Selections</value>
</data>
<data name="Options_SystemOptions" xml:space="preserve">
<value>System</value>
</data>
<data name="MetadataView_Actors" xml:space="preserve">
<value>Actors:</value>
</data>
<data name="MetadataView_Comments" xml:space="preserve">
<value>Comments:</value>
</data>
<data name="MetadataView_Description" xml:space="preserve">
<value>Описание:</value>
</data>
<data name="MetadataView_Director" xml:space="preserve">
<value>Director:</value>
</data>
<data name="MetadataView_Genre" xml:space="preserve">
<value>Genre:</value>
</data>
<data name="MetadataView_Plot" xml:space="preserve">
<value>Plot:</value>
</data>
<data name="MetadataView_ReleaseDate" xml:space="preserve">
<value>Release Date:</value>
</data>
<data name="MetadataView_TitleTag" xml:space="preserve">
<value>Title:</value>
</data>
</root>
......@@ -1690,7 +1690,7 @@ FPS: {3:000.0}, 平均FPS: {4:000.0}
<value>编码器调优:</value>
</data>
<data name="VideoView_ExtraOptions" xml:space="preserve">
<value>额外选项:</value>
<value>高级选项:</value>
</data>
<data name="VideoView_FastDecode" xml:space="preserve">
<value>快速解码</value>
......@@ -1981,7 +1981,7 @@ FPS: {3:000.0}, 平均FPS: {4:000.0}
<value>导出列队(仅限命令行界面)</value>
</data>
<data name="Options_DarkTheme" xml:space="preserve">
<value>使用黑暗主题.(需要重新启动)(这是早期预览,尚未完成!)</value>
<value>使用黑暗主题。(需要重启软件,仅支持 Windows 10)</value>
</data>
<data name="QueueView_NotAvailable" xml:space="preserve">
<value>不可用</value>
......@@ -2007,4 +2007,31 @@ FPS: {3:000.0}, 平均FPS: {4:000.0}
<data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
<value>配置自动字幕选择</value>
</data>
<data name="Options_SystemOptions" xml:space="preserve">
<value>系统</value>
</data>
<data name="MetadataView_Actors" xml:space="preserve">
<value>演员:</value>
</data>
<data name="MetadataView_Comments" xml:space="preserve">
<value>评论:</value>
</data>
<data name="MetadataView_Description" xml:space="preserve">
<value>描述:</value>
</data>
<data name="MetadataView_Director" xml:space="preserve">
<value>导演:</value>
</data>
<data name="MetadataView_Genre" xml:space="preserve">
<value>类型:</value>
</data>
<data name="MetadataView_Plot" xml:space="preserve">
<value>剧情:</value>
</data>
<data name="MetadataView_ReleaseDate" xml:space="preserve">
<value>发行日期:</value>
</data>
<data name="MetadataView_TitleTag" xml:space="preserve">
<value>标题:</value>
</data>
</root>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment