[vlc-commits] microdns: IPv6 support

[Petri Hintukainen]

vlc | branch: master | Petri Hintukainen  | Mon Apr 25 
14:24:28 2016 +0300| [4268df2aa9f0c09b7b5c4853b7e008e8dac8d40d] | committer: 
Petri Hintukainen

microdns: IPv6 support

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

 modules/services_discovery/microdns.c |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/services_discovery/microdns.c 
b/modules/services_discovery/microdns.c
index f83588e..247fb19 100644
--- a/modules/services_discovery/microdns.c
+++ b/modules/services_discovery/microdns.c
@@ -301,6 +301,7 @@ parse_entries( const struct rr_entry *p_entries, bool 
b_renderer,
 
 /* There is one ip for several srvs, fetch them */
 const char *psz_ip = NULL;
+char psz_ip6[INET6_ADDRSTRLEN + 2];
 i_nb_srv = 0;
 for( const struct rr_entry *p_entry = p_entries;
  p_entry != NULL; p_entry = p_entry->next )
@@ -329,10 +330,11 @@ parse_entries( const struct rr_entry *p_entries, bool 
b_renderer,
 }
 else if( p_entry->type == RR_A && psz_ip == NULL )
 psz_ip = p_entry->data.A.addr_str;
-/* TODO support ipv6
-else if( p_entry->type == RR_ )
-psz_ip = p_entry->data..addr_str;
-*/
+else if( p_entry->type == RR_ && psz_ip == NULL )
+{
+if (snprintf(psz_ip6, sizeof(psz_ip6), "[%s]", 
p_entry->data..addr_str) > 0)
+psz_ip = psz_ip6;
+}
 }
 if( psz_ip == NULL || i_nb_srv == 0 )
 {

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

[vlc-commits] bluray: fix memory leak

[Hannes Domani]

vlc | branch: master | Hannes Domani  | Wed May  4 21:22:41 
2016 +0200| [fa5c29224e01f1d5330ba7a4cb28d1a360f0386f] | committer: Petri 
Hintukainen

bluray: fix memory leak

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

 modules/access/bluray.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 6e35875..44f8fc5 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -211,7 +211,7 @@ struct subpicture_updater_sys_t
 static void unref_subpicture_updater(subpicture_updater_sys_t *p_sys)
 {
 vlc_mutex_lock(_sys->lock);
-int refs = p_sys->ref_cnt--;
+int refs = --p_sys->ref_cnt;
 p_sys->p_overlay = NULL;
 vlc_mutex_unlock(_sys->lock);
 

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

[vlc-commits] bluray: Cosmetics

[Petri Hintukainen]

vlc | branch: master | Petri Hintukainen  | Wed Apr 27 
18:56:04 2016 +0300| [89f3b017d433646e25dfff83ab75fd1cebb6ec61] | committer: 
Petri Hintukainen

bluray: Cosmetics

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

 modules/access/bluray.c |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index cb4c56c..6e35875 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1633,15 +1633,15 @@ static void blurayUpdateTitleInfo(input_title_t *t, 
BLURAY_TITLE_INFO *title_inf
 vlc_seekpoint_Delete( t->seekpoint[i] );
 TAB_CLEAN(t->i_seekpoint, t->seekpoint);
 
-for (unsigned int j = 0; j < title_info->chapter_count; j++) {
-seekpoint_t *s = vlc_seekpoint_New();
-if (!s) {
-break;
-}
-s->i_time_offset = FROM_TICKS(title_info->chapters[j].start);
-
-TAB_APPEND(t->i_seekpoint, t->seekpoint, s);
+for (unsigned int j = 0; j < title_info->chapter_count; j++) {
+seekpoint_t *s = vlc_seekpoint_New();
+if (!s) {
+break;
 }
+s->i_time_offset = FROM_TICKS(title_info->chapters[j].start);
+
+TAB_APPEND(t->i_seekpoint, t->seekpoint, s);
+}
 }
 
 static void blurayInitTitles(demux_t *p_demux, int menu_titles)

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