[vlc-commits] Qt: sprefs: word wrap long label

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
22:34:09 2014 +0200| [15958ae9788715875947f784ec8fed473e283c4f] | committer: 
Francois Cartegnie

Qt: sprefs: word wrap long label

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

 modules/gui/qt4/components/preferences_widgets.cpp |1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp 
b/modules/gui/qt4/components/preferences_widgets.cpp
index 7aff7f4..da724dc 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1132,6 +1132,7 @@ KeySelectorControl::KeySelectorControl( vlc_object_t 
*_p_this,
 qtr( "Select or double click an action to change the associated "
  "hotkey. Use delete key to remove hotkeys"), p );
 
+label->setWordWrap( true );
 searchLabel = new QLabel( qtr( "Search" ), p );
 actionSearch = new SearchLineEdit();
 

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

[vlc-commits] demux: mp4: add shortcut for box data union

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
19:59:04 2014 +0200| [f1c892ea0bf69a62450c60cc2a952546b49106d9] | committer: 
Francois Cartegnie

demux: mp4: add shortcut for box data union

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

 modules/demux/mp4/mp4.c |  142 ---
 1 file changed, 73 insertions(+), 69 deletions(-)

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

[vlc-commits] demux: mp4: compute virtual box size

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
19:58:05 2014 +0200| [e8f515eda6dc7ef231217666e464923696fe716d] | committer: 
Francois Cartegnie

demux: mp4: compute virtual box size

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

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

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 34021ad..2125975 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3648,6 +3648,13 @@ MP4_Box_t *MP4_BoxGetNextChunk( stream_t *s )
 
 MP4_ReadBoxContainerChildren( s, p_chunk, ATOM_moof );
 
+p_tmp_box = p_chunk->p_first;
+while( p_tmp_box )
+{
+p_chunk->i_size += p_tmp_box->i_size;
+p_tmp_box = p_tmp_box->p_next;
+}
+
 return p_chunk;
 }
 

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

[vlc-commits] demux: mp4: add trex helper and box checks

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
20:40:07 2014 +0200| [3c96b5b83a0fa81fb3a7cb19258bd688f876132a] | committer: 
Francois Cartegnie

demux: mp4: add trex helper and box checks

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

 modules/demux/mp4/mp4.c |   24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index bd9e83a..9837e59 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -111,6 +111,8 @@ static void MP4_TrackSetELST( demux_t *, mp4_track_t *, 
int64_t );
 static void MP4_UpdateSeekpoint( demux_t * );
 static const char *MP4_ConvertMacCode( uint16_t );
 
+static MP4_Box_t * MP4_GetTrexByTrackID( MP4_Box_t *p_moov, const uint32_t 
i_id );
+
 static uint32_t stream_ReadU32( stream_t *s, void *p_read, uint32_t i_toread )
 {
 uint32_t i_return = 0;
@@ -126,6 +128,19 @@ static uint32_t stream_ReadU32( stream_t *s, void *p_read, 
uint32_t i_toread )
 return i_return;
 }
 
+static MP4_Box_t * MP4_GetTrexByTrackID( MP4_Box_t *p_moov, const uint32_t 
i_id )
+{
+MP4_Box_t *p_trex = MP4_BoxGet( p_moov, "mvex/trex" );
+while( p_trex )
+{
+if ( p_trex->i_type == ATOM_trex && BOXDATA(p_trex)->i_track_ID == 
i_id )
+break;
+else
+p_trex = p_trex->p_next;
+}
+return p_trex;
+}
+
 /* Return time in microsecond of a track */
 static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track )
 {
@@ -3747,14 +3762,9 @@ static int MP4_frg_GetChunk( demux_t *p_demux, MP4_Box_t 
*p_chunk, unsigned *i_t
  * more than one subsegment. */
 if( !default_duration )
 {
-MP4_Box_t *p_trex = MP4_BoxGet( p_demux->p_sys->p_root, 
"moov/mvex/trex");
+MP4_Box_t *p_trex = MP4_GetTrexByTrackID( p_moof, i_track_ID );
 if ( p_trex )
-{
-while( p_trex && p_trex->data.p_trex->i_track_ID != i_track_ID )
-p_trex = p_trex->p_next;
-if ( p_trex )
-default_duration = BOXDATA(p_trex)->i_default_sample_duration;
-}
+default_duration = BOXDATA(p_trex)->i_default_sample_duration;
 else if( p_sidx )
 {
 MP4_Box_data_sidx_t *p_sidx_data = BOXDATA(p_sidx);

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

[vlc-commits] Contribs: update to 2.5.3

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
18:23:43 2014 +0200| [bd5e28889f0f4645d83bcbbb893e4c15b7a45c2d] | committer: 
Jean-Baptiste Kempf

Contribs: update to 2.5.3

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

 contrib/src/freetype2/SHA512SUMS |2 +-
 contrib/src/freetype2/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/freetype2/SHA512SUMS b/contrib/src/freetype2/SHA512SUMS
index 17ea345..015fb8a 100644
--- a/contrib/src/freetype2/SHA512SUMS
+++ b/contrib/src/freetype2/SHA512SUMS
@@ -1 +1 @@
-e8c1d127730d9085845069845ea85e2dcbfa4b8446455758a748a122e87bf247a4bcec248fcf2da4f6c8331dc7e7aa1ec73444863a44f9d77003687546f2de78
  freetype-2.5.0.1.tar.gz
+9ab7b77c5c09b1eb5baee7eb16da8a5f6fa7168cfa886bfed392b2fe80a985bcedecfbb8ed562c822ec9e48b061fb5fcdd9eea69eb44f970c2d1c55581f31d25
  freetype-2.5.3.tar.gz
diff --git a/contrib/src/freetype2/rules.mak b/contrib/src/freetype2/rules.mak
index fecfa1b..bbbf05b 100644
--- a/contrib/src/freetype2/rules.mak
+++ b/contrib/src/freetype2/rules.mak
@@ -1,6 +1,6 @@
 # freetype2
 
-FREETYPE2_VERSION := 2.5.0.1
+FREETYPE2_VERSION := 2.5.3
 FREETYPE2_URL := 
$(SF)/freetype/freetype2/$(FREETYPE2_VERSION)/freetype-$(FREETYPE2_VERSION).tar.gz
 
 PKGS += freetype2

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

[vlc-commits] Contribs: update modplug to 0.8.8.5

2014-05-24 Thread Jean-Baptiste Kempf 
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf  | Sat 
May 24 18:04:16 2014 +0200| [6fc9ba50ffe301a610c912790b18f3953e5f84cb] | 
committer: Jean-Baptiste Kempf

Contribs: update modplug to 0.8.8.5

Finally, a release!

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

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

 contrib/src/modplug/SHA512SUMS |2 +-
 contrib/src/modplug/rules.mak  |   24 ++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/contrib/src/modplug/SHA512SUMS b/contrib/src/modplug/SHA512SUMS
index 6676347..a2ed6ba 100644
--- a/contrib/src/modplug/SHA512SUMS
+++ b/contrib/src/modplug/SHA512SUMS
@@ -1 +1 @@
-49869a9e6d8a487ae860dae9901dcdaff7f8d88054e0797bddf50af218e4287e26025f9758711dba29ecedc41b4915a9b660b16fad53eff1b93bada23e6aa1d8
  modplug-xmms-git-bc8cb8248788c05b77da7d653f4c677354339a21.zip
+aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332
  libmodplug-0.8.8.5.tar.gz
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 4ae064c..8ac2484 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -1,29 +1,25 @@
 # modplug
 
-#MODPLUG_VERSION := 0.8.8.4
-#MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
-
-MODPLUG_GIT_HASH := bc8cb8248788c05b77da7d653f4c677354339a21
-#MODPLUG_URL := 
http://sourceforge.net/code-snapshots/git/m/mo/modplug-xmms/git.git/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
-MODPLUG_URL := 
http://download.videolan.org/pub/contrib/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
+MODPLUG_VERSION := 0.8.8.5
+MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
 
 PKGS += modplug
-ifeq ($(call need_pkg,"libmodplug >= 0.8.4 libmodplug != 0.8.8"),)
+ifeq ($(call need_pkg,"libmodplug >= 0.8.8.5"),)
 PKGS_FOUND += modplug
 endif
 
-$(TARBALLS)/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip:
+$(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
$(call download,$(MODPLUG_URL))
 
-.sum-modplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
+.sum-modplug: libmodplug-$(MODPLUG_VERSION).tar.gz
 
-libmodplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip .sum-modplug
+libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(UNPACK)
-   $(call pkg_static,"libmodplug/libmodplug.pc.in")
+   $(call pkg_static,"libmodplug.pc.in")
$(MOVE)
 
 .modplug: libmodplug
-   cd $< && $(RECONF)
-   cd $https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contribs: update GnuTLS to 3.1.24

2014-05-24 Thread Jean-Baptiste Kempf 
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf  | Sat 
May 24 17:47:43 2014 +0200| [07e716b5db102ec08126bee3a06adf3edfad70e3] | 
committer: Jean-Baptiste Kempf

Contribs: update GnuTLS to 3.1.24

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

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

 contrib/src/gnutls/SHA512SUMS |2 +-
 contrib/src/gnutls/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
index 450b67a..a7187c5 100644
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@ -1 +1 @@
-4c36af18368db2368399ec957c3d9f200d1aac7b5079f75b9edc074e90a919e22e271e44dd5b209a74b4b011503345b8a2fa7e82fb1a835f45d13e481aca4f15
  gnutls-3.1.22.tar.xz
+f35a37d6bc28e581f62368549f0a5668853ceae23cef1880bd167d65e024832fc1b8e615d4bc336867c3e261a5d34a1d435efe726c0b288974718a9fc1e34154
  gnutls-3.1.24.tar.xz
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 6c8faa1..207772e 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,6 +1,6 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.1.22
+GNUTLS_VERSION := 3.1.24
 GNUTLS_URL := 
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifndef HAVE_IOS

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

[vlc-commits] Contribs: update libass to 0.11.2

2014-05-24 Thread Tristan Matthews 
vlc/vlc-2.1 | branch: master | Tristan Matthews  | 
Sun Apr 27 10:37:31 2014 -0400| [3da8f578f25b4e2ac58b679267d21d87d3c403e2] | 
committer: Jean-Baptiste Kempf

Contribs: update libass to 0.11.2

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

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

 contrib/src/ass/SHA512SUMS |2 +-
 contrib/src/ass/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ass/SHA512SUMS b/contrib/src/ass/SHA512SUMS
index 8d589d9..6b0496c 100644
--- a/contrib/src/ass/SHA512SUMS
+++ b/contrib/src/ass/SHA512SUMS
@@ -1 +1 @@
-e40dc0bdc7a12d4515122026dba7cb8b98b9a114eb23a9c36444a8d7bc1b6ec3d8876e113238a5ba5acd39faec5d302d191a14de59478ab4c1c66be58ffa3654
  libass-0.11.1.tar.gz
+84ab20c3f9ede1c68ae91eb23c7047657abf98d3c0567136e39d165e04075bb72a6a95036cfe42274e87ef91b3cf07fbb8e81ed6f052b4248a9763b296d63abb
  libass-0.11.2.tar.gz
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 971a1fa..d93d33c 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -1,5 +1,5 @@
 # ASS
-ASS_VERSION := 0.11.1
+ASS_VERSION := 0.11.2
 ASS_URL := 
https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
 
 PKGS += ass

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

[vlc-commits] Contribs: Update gpg-error to 1.13

2014-05-24 Thread Jean-Baptiste Kempf 
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf  | Sat 
May 24 17:55:12 2014 +0200| [89d60255edfb1a96dc1532dbd6dd5752ab6078fe] | 
committer: Jean-Baptiste Kempf

Contribs: Update gpg-error to 1.13

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

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

 contrib/src/gpg-error/SHA512SUMS |2 +-
 contrib/src/gpg-error/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/gpg-error/SHA512SUMS b/contrib/src/gpg-error/SHA512SUMS
index e17f389..e1f691e 100644
--- a/contrib/src/gpg-error/SHA512SUMS
+++ b/contrib/src/gpg-error/SHA512SUMS
@@ -1 +1 @@
-eff9ee101e8b48cab635ef22bb5546947e85a8e267cc87260166fb36793d983943a951bfe92dd5d87381d6eb2b9ff5315286db20c06de29aa6dd6e95533a0c14
  libgpg-error-1.12.tar.bz2
+db35cff54f12fef121f62bd989147acb8a2bc0711564e7153c1d10c5542e3530d3b3e172210320d312a8438372a099977dc72905e1fcdc29eddfacf8d34998fe
  libgpg-error-1.13.tar.bz2
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index c42ed10..0336408 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -1,5 +1,5 @@
 # GPGERROR
-GPGERROR_VERSION := 1.12
+GPGERROR_VERSION := 1.13
 GPGERROR_URL := 
ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 
 $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:

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

[vlc-commits] Contribs: update PNG to 1.6.10

2014-05-24 Thread Jean-Baptiste Kempf 
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf  | Sat 
May 24 18:12:41 2014 +0200| [66af5bbac258b5c52d87a5b3caf88389578609a8] | 
committer: Jean-Baptiste Kempf

Contribs: update PNG to 1.6.10

CVE-2014-0333

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

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

 contrib/src/png/SHA512SUMS |2 +-
 contrib/src/png/bins.patch |   10 +-
 contrib/src/png/rules.mak  |2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/src/png/SHA512SUMS b/contrib/src/png/SHA512SUMS
index 1c073fd..2aa9013 100644
--- a/contrib/src/png/SHA512SUMS
+++ b/contrib/src/png/SHA512SUMS
@@ -1 +1 @@
-788da3ba1785fd9b9d1009f3b2dad5120ce330e0340b14057143957010b71920a0f524c9f77c877f359382f75f95542f6b71a81b6ee138b7b6ae1d11c318ebde
  libpng-1.6.8.tar.xz
+f475ba5544b11064544a1571e194a7e4cf387d386cd9f300f8bbdc252636a141ac2beeff47f32ee45617d894a8dee8c0c81e71ba3d0c42a47160ce32078cd1b5
  libpng-1.6.10.tar.xz
diff --git a/contrib/src/png/bins.patch b/contrib/src/png/bins.patch
index 1f51ada..317f9c8 100644
--- a/contrib/src/png/bins.patch
+++ b/contrib/src/png/bins.patch
@@ -1,15 +1,15 @@
 png/Makefile.am.orig   2013-08-20 14:05:04.803159380 +0200
-+++ png/Makefile.am2013-08-20 14:05:10.795159128 +0200
+--- libpng-1.6.10/Makefile.am.orig 2014-05-24 18:11:01.881964331 +0200
 libpng-1.6.10/Makefile.am  2014-05-24 18:12:02.839819773 +0200
 @@ -7,10 +7,10 @@
  ACLOCAL_AMFLAGS = -I scripts
  
  # test programs - run on make check, make distcheck
--check_PROGRAMS= pngtest pngunknown pngstest pngvalid
+-check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
 +check_PROGRAMS= 
  
  # Utilities - installed
 -bin_PROGRAMS= pngfix png-fix-itxt
 +bin_PROGRAMS= 
  
- pngtest_SOURCES = pngtest.c
- pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+ # This ensures that pnglibconf.h gets built at the start of 'make all' or
+ # 'make check', but it does not add dependencies to the individual programs,
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 468dd14..2ddfc6a 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -1,5 +1,5 @@
 # PNG
-PNG_VERSION := 1.6.8
+PNG_VERSION := 1.6.10
 PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
 
 PKGS += png

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

[vlc-commits] Contribs: update libass to 0.11.1

2014-05-24 Thread Tristan Matthews 
vlc/vlc-2.1 | branch: master | Tristan Matthews  | 
Tue Mar 25 14:05:29 2014 -0400| [9982a053e4a691657b8e161dc43375545ad4effc] | 
committer: Jean-Baptiste Kempf

Contribs: update libass to 0.11.1

libass is now hosted on github

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

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

 contrib/src/ass/SHA512SUMS |2 +-
 contrib/src/ass/rules.mak  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/ass/SHA512SUMS b/contrib/src/ass/SHA512SUMS
index b7e578b..8d589d9 100644
--- a/contrib/src/ass/SHA512SUMS
+++ b/contrib/src/ass/SHA512SUMS
@@ -1 +1 @@
-450141f5de5125696edbd44019e5eccb8b34f6173692c50abbc3b82b565221d4454760489469542dc4e2a51c7f952b4a565f2e9468b3fa8550a62e2eb1836b77
  libass-0.10.2.tar.gz
+e40dc0bdc7a12d4515122026dba7cb8b98b9a114eb23a9c36444a8d7bc1b6ec3d8876e113238a5ba5acd39faec5d302d191a14de59478ab4c1c66be58ffa3654
  libass-0.11.1.tar.gz
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index e85c048..971a1fa 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -1,6 +1,6 @@
 # ASS
-ASS_VERSION := 0.10.2
-ASS_URL := http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.gz
+ASS_VERSION := 0.11.1
+ASS_URL := 
https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
 
 PKGS += ass
 ifeq ($(call need_pkg,"libass"),)

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

[vlc-commits] Contribs: update PNG to 1.6.10

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
18:12:41 2014 +0200| [4bcd83c9546dbb87e6ab931866923da371c49410] | committer: 
Jean-Baptiste Kempf

Contribs: update PNG to 1.6.10

CVE-2014-0333

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

 contrib/src/png/SHA512SUMS |2 +-
 contrib/src/png/bins.patch |   10 +-
 contrib/src/png/rules.mak  |2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/src/png/SHA512SUMS b/contrib/src/png/SHA512SUMS
index 1c073fd..2aa9013 100644
--- a/contrib/src/png/SHA512SUMS
+++ b/contrib/src/png/SHA512SUMS
@@ -1 +1 @@
-788da3ba1785fd9b9d1009f3b2dad5120ce330e0340b14057143957010b71920a0f524c9f77c877f359382f75f95542f6b71a81b6ee138b7b6ae1d11c318ebde
  libpng-1.6.8.tar.xz
+f475ba5544b11064544a1571e194a7e4cf387d386cd9f300f8bbdc252636a141ac2beeff47f32ee45617d894a8dee8c0c81e71ba3d0c42a47160ce32078cd1b5
  libpng-1.6.10.tar.xz
diff --git a/contrib/src/png/bins.patch b/contrib/src/png/bins.patch
index 1f51ada..317f9c8 100644
--- a/contrib/src/png/bins.patch
+++ b/contrib/src/png/bins.patch
@@ -1,15 +1,15 @@
 png/Makefile.am.orig   2013-08-20 14:05:04.803159380 +0200
-+++ png/Makefile.am2013-08-20 14:05:10.795159128 +0200
+--- libpng-1.6.10/Makefile.am.orig 2014-05-24 18:11:01.881964331 +0200
 libpng-1.6.10/Makefile.am  2014-05-24 18:12:02.839819773 +0200
 @@ -7,10 +7,10 @@
  ACLOCAL_AMFLAGS = -I scripts
  
  # test programs - run on make check, make distcheck
--check_PROGRAMS= pngtest pngunknown pngstest pngvalid
+-check_PROGRAMS= pngtest pngunknown pngstest pngvalid pngimage
 +check_PROGRAMS= 
  
  # Utilities - installed
 -bin_PROGRAMS= pngfix png-fix-itxt
 +bin_PROGRAMS= 
  
- pngtest_SOURCES = pngtest.c
- pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+ # This ensures that pnglibconf.h gets built at the start of 'make all' or
+ # 'make check', but it does not add dependencies to the individual programs,
diff --git a/contrib/src/png/rules.mak b/contrib/src/png/rules.mak
index 468dd14..2ddfc6a 100644
--- a/contrib/src/png/rules.mak
+++ b/contrib/src/png/rules.mak
@@ -1,5 +1,5 @@
 # PNG
-PNG_VERSION := 1.6.8
+PNG_VERSION := 1.6.10
 PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
 
 PKGS += png

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

[vlc-commits] Contribs: update modplug to 0.8.8.5

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
18:04:16 2014 +0200| [9b11ab7ad01758a25742600c411bc61db05c4ae8] | committer: 
Jean-Baptiste Kempf

Contribs: update modplug to 0.8.8.5

Finally, a release!

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

 contrib/src/modplug/SHA512SUMS |2 +-
 contrib/src/modplug/rules.mak  |   24 ++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/contrib/src/modplug/SHA512SUMS b/contrib/src/modplug/SHA512SUMS
index 6676347..a2ed6ba 100644
--- a/contrib/src/modplug/SHA512SUMS
+++ b/contrib/src/modplug/SHA512SUMS
@@ -1 +1 @@
-49869a9e6d8a487ae860dae9901dcdaff7f8d88054e0797bddf50af218e4287e26025f9758711dba29ecedc41b4915a9b660b16fad53eff1b93bada23e6aa1d8
  modplug-xmms-git-bc8cb8248788c05b77da7d653f4c677354339a21.zip
+aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332
  libmodplug-0.8.8.5.tar.gz
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 4ae064c..8ac2484 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -1,29 +1,25 @@
 # modplug
 
-#MODPLUG_VERSION := 0.8.8.4
-#MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
-
-MODPLUG_GIT_HASH := bc8cb8248788c05b77da7d653f4c677354339a21
-#MODPLUG_URL := 
http://sourceforge.net/code-snapshots/git/m/mo/modplug-xmms/git.git/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
-MODPLUG_URL := 
http://download.videolan.org/pub/contrib/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
+MODPLUG_VERSION := 0.8.8.5
+MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
 
 PKGS += modplug
-ifeq ($(call need_pkg,"libmodplug >= 0.8.4 libmodplug != 0.8.8"),)
+ifeq ($(call need_pkg,"libmodplug >= 0.8.8.5"),)
 PKGS_FOUND += modplug
 endif
 
-$(TARBALLS)/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip:
+$(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
$(call download,$(MODPLUG_URL))
 
-.sum-modplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
+.sum-modplug: libmodplug-$(MODPLUG_VERSION).tar.gz
 
-libmodplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip .sum-modplug
+libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(UNPACK)
-   $(call pkg_static,"libmodplug/libmodplug.pc.in")
+   $(call pkg_static,"libmodplug.pc.in")
$(MOVE)
 
 .modplug: libmodplug
-   cd $< && $(RECONF)
-   cd $https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contribs: update dvbpsi to 1.2.0

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
17:46:39 2014 +0200| [18af0f4b38abcde515e69eaaa1508a58ce33b5f9] | committer: 
Jean-Baptiste Kempf

Contribs: update dvbpsi to 1.2.0

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

 contrib/src/dvbpsi/SHA512SUMS |2 +-
 contrib/src/dvbpsi/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/dvbpsi/SHA512SUMS b/contrib/src/dvbpsi/SHA512SUMS
index 4f5e2f0..0efeaec 100644
--- a/contrib/src/dvbpsi/SHA512SUMS
+++ b/contrib/src/dvbpsi/SHA512SUMS
@@ -1 +1 @@
-9102157467b5b1d1cc42574ce0b6e250974a138ad402eff6707fed1656aeefc19ccff8b041cfef8dd10d8ca3914e83272c0683aa8e7cb59970e619db65eb6167
  libdvbpsi-1.1.2.tar.bz2
+951db13f5645d4d6a160719fc6ac97fd31a32d5d17cb8e26db94702e65b6fac3d4e7a99c3c417e09fe5ce33f3b0c0ef86206c77b36816dcd8a3bd5b0bb4a9684
  libdvbpsi-1.2.0.tar.bz2
diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 4eb9d42..454fdbe 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -1,6 +1,6 @@
 # dvbpsi
 
-DVBPSI_VERSION := 1.1.2
+DVBPSI_VERSION := 1.2.0
 DVBPSI_URL := 
$(VIDEOLAN)/libdvbpsi/$(DVBPSI_VERSION)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2
 
 PKGS += dvbpsi

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

[vlc-commits] Contribs: update GnuTLS to 3.1.24

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
17:47:43 2014 +0200| [76c6d083f9e3ae1e8e6c95710027b493ffb3f717] | committer: 
Jean-Baptiste Kempf

Contribs: update GnuTLS to 3.1.24

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

 contrib/src/gnutls/SHA512SUMS |2 +-
 contrib/src/gnutls/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/gnutls/SHA512SUMS b/contrib/src/gnutls/SHA512SUMS
index 450b67a..a7187c5 100644
--- a/contrib/src/gnutls/SHA512SUMS
+++ b/contrib/src/gnutls/SHA512SUMS
@@ -1 +1 @@
-4c36af18368db2368399ec957c3d9f200d1aac7b5079f75b9edc074e90a919e22e271e44dd5b209a74b4b011503345b8a2fa7e82fb1a835f45d13e481aca4f15
  gnutls-3.1.22.tar.xz
+f35a37d6bc28e581f62368549f0a5668853ceae23cef1880bd167d65e024832fc1b8e615d4bc336867c3e261a5d34a1d435efe726c0b288974718a9fc1e34154
  gnutls-3.1.24.tar.xz
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index cf467f4..da5cb4b 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -1,6 +1,6 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.1.22
+GNUTLS_VERSION := 3.1.24
 GNUTLS_URL := 
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK

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

[vlc-commits] Contribs: Update gpg-error to 1.13

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
17:55:12 2014 +0200| [67fc4b9fb66681ebb9735557ee6a8c9d3b6992bc] | committer: 
Jean-Baptiste Kempf

Contribs: Update gpg-error to 1.13

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

 contrib/src/gpg-error/SHA512SUMS |2 +-
 contrib/src/gpg-error/rules.mak  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/gpg-error/SHA512SUMS b/contrib/src/gpg-error/SHA512SUMS
index e17f389..e1f691e 100644
--- a/contrib/src/gpg-error/SHA512SUMS
+++ b/contrib/src/gpg-error/SHA512SUMS
@@ -1 +1 @@
-eff9ee101e8b48cab635ef22bb5546947e85a8e267cc87260166fb36793d983943a951bfe92dd5d87381d6eb2b9ff5315286db20c06de29aa6dd6e95533a0c14
  libgpg-error-1.12.tar.bz2
+db35cff54f12fef121f62bd989147acb8a2bc0711564e7153c1d10c5542e3530d3b3e172210320d312a8438372a099977dc72905e1fcdc29eddfacf8d34998fe
  libgpg-error-1.13.tar.bz2
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index c42ed10..0336408 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -1,5 +1,5 @@
 # GPGERROR
-GPGERROR_VERSION := 1.12
+GPGERROR_VERSION := 1.13
 GPGERROR_URL := 
ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 
 $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:

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

[vlc-commits] demux: mp4: fix reading elst

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
16:51:26 2014 +0200| [21c8fcc85ce0b84834ab123074a84964f9776d8b] | committer: 
Francois Cartegnie

demux: mp4: fix reading elst

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

 modules/demux/mp4/libmp4.c |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 329d21d..4cb0292 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2261,19 +2261,21 @@ static int MP4_ReadBox_elst( stream_t *p_stream, 
MP4_Box_t *p_box )
 MP4_READBOX_EXIT( 0 );
 }
 
-
-for( unsigned i = 0; i < p_box->data.p_elst->i_entry_count; i++ )
+unsigned i;
+for( i = 0; i < p_box->data.p_elst->i_entry_count; i++ )
 {
 if( p_box->data.p_elst->i_version == 1 )
 {
-
+if ( i_read < 20 )
+break;
 MP4_GET8BYTES( p_box->data.p_elst->i_segment_duration[i] );
 
 MP4_GET8BYTES( p_box->data.p_elst->i_media_time[i] );
 }
 else
 {
-
+if ( i_read < 12 )
+break;
 MP4_GET4BYTES( p_box->data.p_elst->i_segment_duration[i] );
 
 MP4_GET4BYTES( p_box->data.p_elst->i_media_time[i] );
@@ -2283,7 +2285,8 @@ static int MP4_ReadBox_elst( stream_t *p_stream, 
MP4_Box_t *p_box )
 MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_integer[i] );
 MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_fraction[i] );
 }
-
+if ( i < p_box->data.p_elst->i_entry_count )
+p_box->data.p_elst->i_entry_count = i;
 #ifdef MP4_VERBOSE
 msg_Dbg( p_stream, "read box: \"elst\" entry-count %lu",
  (unsigned long)p_box->data.p_elst->i_entry_count );

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

[vlc-commits] demux: mp4: fix reading stss/stsh

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
16:49:36 2014 +0200| [b6b90af630decc3dc1fe7f21dd420a5ba53a45df] | committer: 
Francois Cartegnie

demux: mp4: fix reading stss/stsh

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

 modules/demux/mp4/libmp4.c |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 3e3716f..329d21d 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2078,13 +2078,16 @@ static int MP4_ReadBox_stss( stream_t *p_stream, 
MP4_Box_t *p_box )
 if( unlikely( p_box->data.p_stss->i_sample_number == NULL ) )
 MP4_READBOX_EXIT( 0 );
 
-for( unsigned int i = 0; (i < p_box->data.p_stss->i_entry_count )&&( 
i_read >= 4 ); i++ )
+unsigned int i;
+for( i = 0; (i < p_box->data.p_stss->i_entry_count )&&( i_read >= 4 ); i++ 
)
 {
 
 MP4_GET4BYTES( p_box->data.p_stss->i_sample_number[i] );
 /* XXX in libmp4 sample begin at 0 */
 p_box->data.p_stss->i_sample_number[i]--;
 }
+if ( i < p_box->data.p_stss->i_entry_count )
+p_box->data.p_stss->i_entry_count = i;
 
 #ifdef MP4_VERBOSE
 msg_Dbg( p_stream, "read box: \"stss\" entry-count %d",
@@ -2125,11 +2128,14 @@ static int MP4_ReadBox_stsh( stream_t *p_stream, 
MP4_Box_t *p_box )
 MP4_READBOX_EXIT( 0 );
 }
 
-for( unsigned i = 0; (i < p_box->data.p_stss->i_entry_count )&&( i_read >= 
8 ); i++ )
+unsigned i;
+for( i = 0; (i < p_box->data.p_stss->i_entry_count )&&( i_read >= 8 ); i++ 
)
 {
 MP4_GET4BYTES( p_box->data.p_stsh->i_shadowed_sample_number[i] );
 MP4_GET4BYTES( p_box->data.p_stsh->i_sync_sample_number[i] );
 }
+if ( i < p_box->data.p_stss->i_entry_count )
+p_box->data.p_stss->i_entry_count = i;
 
 #ifdef MP4_VERBOSE
 msg_Dbg( p_stream, "read box: \"stsh\" entry-count %d",

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

[vlc-commits] fetcher: fix setting pointer to out of scope var (cid #1215273)

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
16:44:34 2014 +0200| [8f50acc100259bf131f6ee9355baaa18a890054c] | committer: 
Francois Cartegnie

fetcher: fix setting pointer to out of scope var (cid #1215273)

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

 src/playlist/fetcher.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index efb0c2a..eb86994 100644
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -226,7 +226,7 @@ static int FindArt( playlist_fetcher_t *p_fetcher, 
input_item_t *p_item )
 }
 msg_Dbg( p_fetcher->object,
  " will search at higher scope, if possible" );
-p_album = &album;
+p_album = &p_fetcher->albums.p_elems[fe_idx];
 break;
 }
 FOREACH_END();

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

[vlc-commits] demux: mp4: fix reading tfra

2014-05-24 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sat May 24 
17:00:43 2014 +0200| [90f7c0b02e49c188042d692fdc8c6ee9b915dc86] | committer: 
Francois Cartegnie

demux: mp4: fix reading tfra

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

 modules/demux/mp4/libmp4.c |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 4cb0292..34021ad 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3064,15 +3064,25 @@ static int MP4_ReadBox_tfra( stream_t *p_stream, 
MP4_Box_t *p_box )
 || !p_tfra->p_trun_number || !p_tfra->p_sample_number )
 goto error;
 
-for( uint32_t i = 0; i < i_number_of_entries; i++ )
+int i_fields_length = 3 + p_tfra->i_length_size_of_traf_num
++ p_tfra->i_length_size_of_trun_num
++ p_tfra->i_length_size_of_sample_num;
+
+uint32_t i;
+for( i = 0; i < i_number_of_entries; i++ )
 {
+
 if( p_tfra->i_version == 1 )
 {
+if ( i_read < i_fields_length + 16 )
+break;
 MP4_GET8BYTES( p_tfra->p_time[i*2] );
 MP4_GET8BYTES( p_tfra->p_moof_offset[i*2] );
 }
 else
 {
+if ( i_read < i_fields_length + 8 )
+break;
 MP4_GET4BYTES( p_tfra->p_time[i] );
 MP4_GET4BYTES( p_tfra->p_moof_offset[i] );
 }
@@ -3130,6 +3140,8 @@ static int MP4_ReadBox_tfra( stream_t *p_stream, 
MP4_Box_t *p_box )
 goto error;
 }
 }
+if ( i < i_number_of_entries )
+i_number_of_entries = i;
 
 #ifdef MP4_VERBOSE
 if( p_tfra->i_version == 0 )

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

[vlc-commits] Fix AUTHORS

2014-05-24 Thread Christoph Miebach 
vlc | branch: master | Christoph Miebach  | Sat May 
24 11:07:04 2014 -0400| [0aaacf561b7e3d944acd4ebdce06a982d72e72de] | committer: 
Christoph Miebach

Fix AUTHORS

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

 AUTHORS |1 -
 1 file changed, 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index c31d3f9..aa67a72 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -835,7 +835,6 @@ viyyer - Hindi
 Vladimir Yermolayev - Russian
 Vojtěch Smejkal - Czech
 Wei Mingzhi - Simplified Chinese
-Xabier Aramendi - Basque
 Xènia Albà Cantero - Catalan
 Xuacu Saturio - Asturian
 Yaron Shahrabani - Hebrew

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

[vlc-commits] make update-po

2014-05-24 Thread Christoph Miebach 
vlc | branch: master | Christoph Miebach  | Sat May 
24 10:58:24 2014 -0400| [1dfb5bdadcdd6fc745a9a6f319b0a10c448b4f4d] | committer: 
Christoph Miebach

make update-po

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

 po/ach.po   |10957 +++---
 po/af.po|10657 ++--
 po/am.po|10517 ++--
 po/an.po|11387 +---
 po/ar.po|11288 +++
 po/ast.po   |11400 +---
 po/az.po|10880 ++---
 po/be.po|11855 ++
 po/bg.po|11719 +
 po/bn.po|11550 
 po/bn_IN.po |11571 +---
 po/br.po|11151 ---
 po/bs.po|11158 ---
 po/ca.po|11545 
 po/cgg.po   |10485 ++--
 po/ckb.po   |10307 +--
 po/co.po|10188 --
 po/cs.po|11280 ---
 po/cy.po|11004 --
 po/da.po|11632 +
 po/de.po|12084 ++-
 po/el.po|11528 
 po/en_GB.po |10787 ++---
 po/es.po|11500 
 po/et.po|11972 +-
 po/eu.po|11223 ---
 po/fa.po|10944 +++---
 po/ff.po|11142 +++---
 po/fi.po|12932 ---
 po/fr.po|11716 +
 po/fur.po   |10439 +--
 po/ga.po|10331 +--
 po/gd.po|10978 +++---
 po/gl.po|11905 +-
 po/gu.po|2 +++---
 po/he.po|11231 ---
 po/hi.po|10964 +++---
 po/hr.po|11261 ---
 po/hu.po|11905 +-
 po/hy.po|10772 +++--
 po/ia.po|10330 +--
 po/id.po|11582 
 po/is.po|10969 +++---
 po/it.po|11370 ---
 po/ja.po|11830 ++
 po/ka.po|10438 +--
 po/kk.po|11274 ---
 po/km.po|11808 +
 po/kn.po|11770 +
 po/ko.po|11394 
 po/ky.po|10217 --
 po/lg.po|10519 ++--
 po/lt.po|11318 ---
 po/lv.po|10933 +++---
 po/mk.po|10192 --
 po/ml.po|11120 +++---
 po/mn.po|10948 +++---
 po/mr.po|11142 +++---
 po/ms.po|11434 
 po/my.po|10914 ++---
 po/nb.po|11231 +++
 po/ne.po|11232 +++
 po/nl.po|11468 
 po/nn.po|10431 +--
 po/oc.po|10963 +++---
 po/or.po|10903 ++---

[vlc-commits] Update MODULES_LIST

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
16:49:53 2014 +0200| [688202348ff876c66b777fe2d0d5ccc281ad67dc] | committer: 
Jean-Baptiste Kempf

Update MODULES_LIST

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

 modules/MODULES_LIST |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 61ad62b..db5820e 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -353,6 +353,7 @@ $Id$
  * subtitle: a demuxer for subtitle files
  * svcdsub: SVCD subtitles decoder
  * svg: a svg renderer module
+ * svgdec: a svg decoder module
  * swscale: Video scaling filter
  * t140: T.140 text encoder
  * taglib: Taglib tags parser and writer
@@ -374,7 +375,8 @@ $Id$
  * uleaddvaudio: codec for DV Audio from Ulead
  * upnp: libupnp UPNP service discovery
  * v4l2: Video 4 Linux 2 input module
- * vaapi: VAAPI hardware-accelerated decoding
+ * vaapi_drm: VAAPI hardware-accelerated decoding with drm backend
+ * vaapi_x11: VAAPI hardware-accelerated decoding with x11 backend
  * vc1: VC-1 Video demuxer
  * vcd: input module for accessing Video CDs
  * vcdx: input module for accessing Video CDs with navigation & stills

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

[vlc-commits] Update NEWS

2014-05-24 Thread Jean-Baptiste Kempf 
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf  | Sat 
May 24 16:46:56 2014 +0200| [e4ac98dd6fe1fe36703b25ccbb6fff475d9b6935] | 
committer: Jean-Baptiste Kempf

Update NEWS

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

 NEWS |   23 +++
 1 file changed, 23 insertions(+)

diff --git a/NEWS b/NEWS
index 3d43595..0226b88 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,29 @@
 Changes between 2.1.4 and 2.1.5:
 
 
+Core:
+ * Fix compilation on OS/2
+
+Audio output:
+ * Fix channel ordering in AUHAL
+ * Increase the buffersize for AUHAL output
+
+Decoders:
+ * Fix DxVA2 decoding of samples needing more surfaces
+ * Improve MAD resistance to broken mp3 streams
+ * Fix PGS alignment in MKV
+
+Interfaces:
+ * Qt: Don't rename mp3 converted files to .raw
+ * Mac OS X: correctly support video-on-top
+ * Fix Mac OS X events propagation with retina displays
+
+Streaming:
+ * Fix transcode when audio format changes
+
+Translations:
+ * Update British English
+
 
 Changes between 2.1.3 and 2.1.4:
 

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

[vlc-commits] Update NEWS

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
16:30:50 2014 +0200| [3c76752f2e175931dabaead3c79cc43ccfecf76c] | committer: 
Jean-Baptiste Kempf

Update NEWS

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

 NEWS |   73 +++---
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 25eb7a7..745 100644
--- a/NEWS
+++ b/NEWS
@@ -7,18 +7,29 @@ Important changes:
 Core:
  * Partial fix of playback of short audio samples
  * Add extensions download from external repositories
+ * Support automatic rotation using streams metadata, GPU-accelerated when 
possible
+ * Rework the metadata fetching algorithm and policies
 
 Access:
  * Added TLS support for ftp access and sout access.
New schemes for implicit (ftps) and explicit (ftpes) modes.
  * MMS audio selection on split audio streams
- * Blu-Ray: support overlays, preferred menu languages, region selection and 
navigation
- * Digital Cinema Package support
+ * Blu-Ray: support overlays, preferred menu languages, region selection
+   and navigation
+ * Digital Cinema Package support, including encrypted DCP with KDM
+ * Partial fixes for Arccos protected DVDs
 
 Decoder:
+ * Support VDPAU acceleration for GPU-zerocopy decoding
+ * Support MediaCodec acceleration for GPU-zerocopy decoding
+ * Add Media Foundation Transform audio and video decoder
+ * Add video decoder module based on GStreamer plugins
+ * Add MMAL decoder for Broadcom VideoCore chips (like the RaspberryPi)
+   supporting MPEG-2 and H.264, supporting GPU-zerocopy display
  * Partial support for Voxware MetaSound
  * libvpx decoder for VP8 and VP9
- * Support MSN Audio, DK3, DK4, IMC, Vivo g723.1, Bink
+ * Support MSN Audio, Atrac3+, VP7, Bink, TAK, On2 AVC, DK3, DK4, IMC, Vivo 
g723.1,
+   Smacker, FIC, Auravision, Canopus Lossless, and numerous videogame codecs
  * Teletext subtitles display improvements
  * Mediacodec speed improvements on x86
  * Support setting the post processing level in Theora
@@ -26,9 +37,10 @@ Decoder:
  * Fix channel ordering of LPCM codec in m2ts files
  * New jpeg image decoder
  * Add tx3g subtitles decoder
- * Add Media Foundation Transform decoder
- * Add decoder module based on GStreamer. Currently supports only video decode.
- * Add mmal based mpeg2/h264 decoder
+ * New SVG image decoder
+ * Fix Speex decoding over RTP and in flv
+ * Support more x264 and FFv1 RGB modes
+ * Improvements on ZVBI teletext decoder, notably for speed and alignments
 
 Encoder:
  * Support for MPEG-2 encoding using x262
@@ -39,28 +51,36 @@ Encoder:
 
 Demuxer:
  * New CAF format module
- * Important rework of the Ogg demuxer, notably for seeking
- * Important rework of the ASF/WMV demuxer, notably for seeking
- * Support microseconds in SubRip subtitles
- * FLAC packets validation using CRC
+ * Important rework of the Ogg demuxer, notably improving seeking,
+   streaming resilience, speex demuxing and chained Ogg
+ * Important rework of the ASF/WMV demuxer, notably for seeking,
+   synchronization and tracks exclusion
+ * AVI improvements for better seek-indexing in non-fastseekable situations
+ * AVI fixes for uncompressed, indexed and paletized bitmaps
  * Support Opus in MKV
  * Support VP8 in OGG
  * Basic support for WebVTT
- * Handle support for ISO/IEC 14496-3 Audio stream type in TS
+ * Handle support for ISO/IEC 14496-3 (AAC) Audio stream type in TS
  * Support HDPR TS files
+ * Support microseconds in SubRip subtitles
+ * FLAC packets validation using CRC
  * Improvements in metadata support in Ogg/Opus/Vorbis files
  * Fix encoding issues in some XML playlist formats
  * Support THP Wii/Gamecube, RenderWare and Escape Replay game video files
  * New HEVC raw packetizer and demuxer
- * Handle MOV/MP4 tx3g styled subtitles through codec
- * AVI fixes for uncompressed and indexed bitmaps
  * TS support for WiDi/Miracast LPCM
+ * Handle MOV/MP4 tx3g styled subtitles through codec
+ * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio
+   and support for rotation, covr atom and tracks exclusion
+ * Support SVG images files (on glib platforms)
+ * Keep selection of tracks on segment changes in MKV
+ * Support detection of SRT languages based on filename
 
 Muxers:
  * Important rework of the Ogg muxer, notably for skeleton
  * Fixes for the AVI muxer for specification respect
  * Support VP8 in OGG
- * Add HEVC muxing in MP4
+ * Add HEVC muxing in MP4 and TS
 
 Video Output:
  * Direct rendering and filtering for VDPAU hardware acceleration
@@ -77,10 +97,15 @@ Video Filter:
  * New Freeze effect filter
  * Support I422 and J422 in transform
  * NEON optimizations for deinterleaving chroma, notably NV12->I420
+ * Fix audiobargraph activation and usage
 
 Audio Output:
  * Allow setting volume while not connected with PulseAudio
  * Audio device notifications for WASAPI
+ * Fix replay of sound buffer in DirectSoun

[vlc-commits] Update NEWS

2014-05-24 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat May 24 
16:30:50 2014 +0200| [df69c5b16509627dd76daccd8b9bdb21d7971f0a] | committer: 
Jean-Baptiste Kempf

Update NEWS

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

 NEWS |   72 +++---
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 25eb7a7..c4770fc 100644
--- a/NEWS
+++ b/NEWS
@@ -7,18 +7,28 @@ Important changes:
 Core:
  * Partial fix of playback of short audio samples
  * Add extensions download from external repositories
+ * Support rotation from files
 
 Access:
  * Added TLS support for ftp access and sout access.
New schemes for implicit (ftps) and explicit (ftpes) modes.
  * MMS audio selection on split audio streams
- * Blu-Ray: support overlays, preferred menu languages, region selection and 
navigation
- * Digital Cinema Package support
+ * Blu-Ray: support overlays, preferred menu languages, region selection
+   and navigation
+ * Digital Cinema Package support, including encrypted DCP with KDM
+ * Partial fixes for Arccos protected DVDs
 
 Decoder:
+ * Support VDPAU acceleration for GPU-zerocopy decoding
+ * Support MediaCodec acceleration for GPU-zerocopy decoding
+ * Add Media Foundation Transform audio and video decoder
+ * Add video decoder module based on GStreamer plugins
+ * Add MMAL decoder for Broadcom VideoCore chips (like the RaspberryPi)
+   supporting MPEG-2 and H.264, supporting GPU-zerocopy display
  * Partial support for Voxware MetaSound
  * libvpx decoder for VP8 and VP9
- * Support MSN Audio, DK3, DK4, IMC, Vivo g723.1, Bink
+ * Support MSN Audio, Atrac3+, VP7, Bink, TAK, On2 AVC, DK3, DK4, IMC, Vivo 
g723.1,
+   Smacker, FIC, Auravision, Canopus Lossless, and numerous videogame codecs
  * Teletext subtitles display improvements
  * Mediacodec speed improvements on x86
  * Support setting the post processing level in Theora
@@ -26,9 +36,10 @@ Decoder:
  * Fix channel ordering of LPCM codec in m2ts files
  * New jpeg image decoder
  * Add tx3g subtitles decoder
- * Add Media Foundation Transform decoder
- * Add decoder module based on GStreamer. Currently supports only video decode.
- * Add mmal based mpeg2/h264 decoder
+ * New SVG image decoder
+ * Fix Speex decoding over RTP and in flv
+ * Support more x264 and FFv1 RGB modes
+ * Improvements on ZVBI teletext decoder, notably for speed and alignments
 
 Encoder:
  * Support for MPEG-2 encoding using x262
@@ -39,28 +50,36 @@ Encoder:
 
 Demuxer:
  * New CAF format module
- * Important rework of the Ogg demuxer, notably for seeking
- * Important rework of the ASF/WMV demuxer, notably for seeking
- * Support microseconds in SubRip subtitles
- * FLAC packets validation using CRC
+ * Important rework of the Ogg demuxer, notably improving seeking,
+   streaming resilience, speex demuxing and chained Ogg
+ * Important rework of the ASF/WMV demuxer, notably for seeking,
+   synchronization and tracks exclusion
+ * AVI improvements for better seek-indexing in non-fastseekable situations
+ * AVI fixes for uncompressed, indexed and paletized bitmaps
  * Support Opus in MKV
  * Support VP8 in OGG
  * Basic support for WebVTT
- * Handle support for ISO/IEC 14496-3 Audio stream type in TS
+ * Handle support for ISO/IEC 14496-3 (AAC) Audio stream type in TS
  * Support HDPR TS files
+ * Support microseconds in SubRip subtitles
+ * FLAC packets validation using CRC
  * Improvements in metadata support in Ogg/Opus/Vorbis files
  * Fix encoding issues in some XML playlist formats
  * Support THP Wii/Gamecube, RenderWare and Escape Replay game video files
  * New HEVC raw packetizer and demuxer
- * Handle MOV/MP4 tx3g styled subtitles through codec
- * AVI fixes for uncompressed and indexed bitmaps
  * TS support for WiDi/Miracast LPCM
+ * Handle MOV/MP4 tx3g styled subtitles through codec
+ * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio
+   and support for rotation, covr atom and tracks exclusion
+ * Support SVG images files (on glib platforms)
+ * Keep selection of tracks on segment changes in MKV
+ * Support detection of SRT languages based on filename
 
 Muxers:
  * Important rework of the Ogg muxer, notably for skeleton
  * Fixes for the AVI muxer for specification respect
  * Support VP8 in OGG
- * Add HEVC muxing in MP4
+ * Add HEVC muxing in MP4 and TS
 
 Video Output:
  * Direct rendering and filtering for VDPAU hardware acceleration
@@ -77,10 +96,15 @@ Video Filter:
  * New Freeze effect filter
  * Support I422 and J422 in transform
  * NEON optimizations for deinterleaving chroma, notably NV12->I420
+ * Fix audiobargraph activation and usage
 
 Audio Output:
  * Allow setting volume while not connected with PulseAudio
  * Audio device notifications for WASAPI
+ * Fix replay of sound buffer in DirectSound
+ * Split of MMDevice and WinRT audio modules
+ * Numerous fixes on AUHAL, including device management and s

[vlc-commits] lib: use explicit array initialisation syntax for position table

2014-05-24 Thread Mark Lee 
vlc | branch: master | Mark Lee  | Sat May 24 
13:00:24 2014 +0100| [c6b8b1b5022e2e701def97e02975814c9ad95942] | committer: 
Rémi Denis-Courmont

lib: use explicit array initialisation syntax for position table

Also use unsigned char rather than int as the type

Signed-off-by: Rémi Denis-Courmont 

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

 lib/media_player.c |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/media_player.c b/lib/media_player.c
index e244bc0..4477a6a 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1450,16 +1450,16 @@ void libvlc_media_player_next_frame( 
libvlc_media_player_t *p_mi )
  * Private lookup table to get subpicture alignment flag values corresponding
  * to a libvlc_position_t enumerated value.
  */
-static const int position_subpicture_alignment[] = {
-0,
-SUBPICTURE_ALIGN_LEFT,
-SUBPICTURE_ALIGN_RIGHT,
-SUBPICTURE_ALIGN_TOP,
-SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT,
-SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_RIGHT,
-SUBPICTURE_ALIGN_BOTTOM,
-SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_LEFT,
-SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_RIGHT
+static const unsigned char position_subpicture_alignment[] = {
+[libvlc_position_center]   = 0,
+[libvlc_position_left] = SUBPICTURE_ALIGN_LEFT,
+[libvlc_position_right]= SUBPICTURE_ALIGN_RIGHT,
+[libvlc_position_top]  = SUBPICTURE_ALIGN_TOP,
+[libvlc_position_top_left] = SUBPICTURE_ALIGN_TOP | 
SUBPICTURE_ALIGN_LEFT,
+[libvlc_position_top_right]= SUBPICTURE_ALIGN_TOP | 
SUBPICTURE_ALIGN_RIGHT,
+[libvlc_position_bottom]   = SUBPICTURE_ALIGN_BOTTOM,
+[libvlc_position_bottom_left]  = SUBPICTURE_ALIGN_BOTTOM | 
SUBPICTURE_ALIGN_LEFT,
+[libvlc_position_bottom_right] = SUBPICTURE_ALIGN_BOTTOM | 
SUBPICTURE_ALIGN_RIGHT
 };
 
 void libvlc_media_player_set_video_title_display( libvlc_media_player_t *p_mi, 
libvlc_position_t position, unsigned timeout )

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

[vlc-commits] ios dialog provider: fix insufficient nil checks

2014-05-24 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Sat May 24 
14:26:42 2014 +0200| [8402ed45ea0c11b35650cf1e901cd023f2b2666b] | committer: 
Felix Paul Kühne

ios dialog provider: fix insufficient nil checks

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

 modules/gui/ios_dialog_provider/dialogProvider.m |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/gui/ios_dialog_provider/dialogProvider.m 
b/modules/gui/ios_dialog_provider/dialogProvider.m
index f72ab3a..8b9e1f8 100644
--- a/modules/gui/ios_dialog_provider/dialogProvider.m
+++ b/modules/gui/ios_dialog_provider/dialogProvider.m
@@ -200,8 +200,12 @@ static int DisplayLogin(vlc_object_t *p_this, const char 
*type, vlc_value_t prev
 intf_sys_t *sys = p_intf->p_sys;
 NSDictionary *dict = [sys->displayer 
displayLogin:DictFromDialogLogin(dialog)];
 if (dict) {
-*dialog->username = strdup([[dict objectForKey:@"username"] 
UTF8String]);
-*dialog->password = strdup([[dict objectForKey:@"password"] 
UTF8String]);
+NSString *username = [dict objectForKey:@"username"];
+if (username != NULL && username.length > 0)
+*dialog->username = strdup([username UTF8String]);
+NSString *password = [dict objectForKey:@"password"];
+if (password != NULL && password.length > 0)
+*dialog->password = strdup([password UTF8String]);
 }
 [pool release];
 return VLC_SUCCESS;

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

[vlc-commits] lib: map the position enum to the correct subpicture alignment bitmasks

2014-05-24 Thread Mark Lee 
vlc | branch: master | Mark Lee  | Sat May 24 
07:41:47 2014 +0100| [dadda2294144efcc26e6c0b9877e477416402f79] | committer: 
Rémi Denis-Courmont

lib: map the position enum to the correct subpicture alignment bitmasks

libvlc_media_player_set_video_title_display() was wrongly using the
enum value directly, leading to the video title appearing in the wrong
position for some values

Signed-off-by: Rémi Denis-Courmont 

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

 lib/media_player.c |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/media_player.c b/lib/media_player.c
index 5e8f6b2..e244bc0 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1446,12 +1446,30 @@ void libvlc_media_player_next_frame( 
libvlc_media_player_t *p_mi )
 }
 }
 
+/**
+ * Private lookup table to get subpicture alignment flag values corresponding
+ * to a libvlc_position_t enumerated value.
+ */
+static const int position_subpicture_alignment[] = {
+0,
+SUBPICTURE_ALIGN_LEFT,
+SUBPICTURE_ALIGN_RIGHT,
+SUBPICTURE_ALIGN_TOP,
+SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_LEFT,
+SUBPICTURE_ALIGN_TOP | SUBPICTURE_ALIGN_RIGHT,
+SUBPICTURE_ALIGN_BOTTOM,
+SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_LEFT,
+SUBPICTURE_ALIGN_BOTTOM | SUBPICTURE_ALIGN_RIGHT
+};
+
 void libvlc_media_player_set_video_title_display( libvlc_media_player_t *p_mi, 
libvlc_position_t position, unsigned timeout )
 {
+assert( position >= libvlc_position_disable && position <= 
libvlc_position_bottom_right );
+
 if ( position != libvlc_position_disable )
 {
 var_SetBool( p_mi, "video-title-show", true );
-var_SetInteger( p_mi, "video-title-position", position );
+var_SetInteger( p_mi, "video-title-position", 
position_subpicture_alignment[position] );
 var_SetInteger( p_mi, "video-title-timeout", timeout );
 }
 else

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

[vlc-commits] macosx: simplify setAudioFilter

2014-05-24 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Sat May 24 
09:24:58 2014 +0200| [4807e99bf3363d8f2f82cf09997da062c65e2e16] | committer: 
David Fuhrmann

macosx: simplify setAudioFilter

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

 modules/gui/macosx/AudioEffects.m |   27 +--
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/modules/gui/macosx/AudioEffects.m 
b/modules/gui/macosx/AudioEffects.m
index 21552a4..a3f80c8 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -161,31 +161,14 @@ static VLCAudioEffects *_o_sharedInstance = nil;
 
 - (void)setAudioFilter: (char *)psz_name on:(BOOL)b_on
 {
-char *psz_tmp;
 audio_output_t *p_aout = getAout();
-if (p_aout)
-psz_tmp = var_GetNonEmptyString(p_aout, "audio-filter");
-else
-psz_tmp = config_GetPsz(p_intf, "audio-filter");
-
-if (b_on) {
-if (!psz_tmp)
-config_PutPsz(p_intf, "audio-filter", psz_name);
-else if (strstr(psz_tmp, psz_name) == NULL) {
-psz_tmp = (char *)[[NSString stringWithFormat: @"%s:%s", psz_tmp, 
psz_name] UTF8String];
-config_PutPsz(p_intf, "audio-filter", psz_tmp);
-}
-} else {
-if (psz_tmp) {
-psz_tmp = (char *)[[[NSString stringWithUTF8String:psz_tmp] 
stringByTrimmingCharactersInSet: [NSCharacterSet 
characterSetWithCharactersInString:[NSString 
stringWithFormat:@":%s",psz_name]]] UTF8String];
-psz_tmp = (char *)[[[NSString stringWithUTF8String:psz_tmp] 
stringByTrimmingCharactersInSet: [NSCharacterSet 
characterSetWithCharactersInString:[NSString 
stringWithFormat:@"%s:",psz_name]]] UTF8String];
-psz_tmp = (char *)[[[NSString stringWithUTF8String:psz_tmp] 
stringByTrimmingCharactersInSet: [NSCharacterSet 
characterSetWithCharactersInString:[NSString stringWithUTF8String:psz_name]]] 
UTF8String];
-config_PutPsz(p_intf, "audio-filter", psz_tmp);
-}
-}
+playlist_EnableAudioFilter(pl_Get(p_intf), psz_name, b_on);
 
 if (p_aout) {
-playlist_EnableAudioFilter(pl_Get(p_intf), psz_name, b_on);
+char *psz_new = var_GetNonEmptyString(p_aout, "audio-filter");
+config_PutPsz(p_intf, "audio-filter", psz_new);
+free(psz_new);
+
 vlc_object_release(p_aout);
 }
 }

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

[vlc-commits] macosx: remove unneeded eq variable initialization

2014-05-24 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Sat May 24 
09:04:19 2014 +0200| [2fa14379ce867c9996cfda9220002211b0cc4dd9] | committer: 
David Fuhrmann

macosx: remove unneeded eq variable initialization

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

 modules/gui/macosx/AudioEffects.h |1 -
 modules/gui/macosx/AudioEffects.m |   15 +--
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/modules/gui/macosx/AudioEffects.h 
b/modules/gui/macosx/AudioEffects.h
index 6423cf1..031050f 100644
--- a/modules/gui/macosx/AudioEffects.h
+++ b/modules/gui/macosx/AudioEffects.h
@@ -119,7 +119,6 @@
 - (void)saveCurrentProfile;
 
 /* Equalizer */
-- (void)setupEqualizer;
 - (void)equalizerUpdated;
 - (void)setValue:(float)value forSlider:(int)index;
 - (IBAction)eq_bandSliderUpdated:(id)sender;
diff --git a/modules/gui/macosx/AudioEffects.m 
b/modules/gui/macosx/AudioEffects.m
index 541d70f..21552a4 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -149,7 +149,7 @@ static VLCAudioEffects *_o_sharedInstance = nil;
 if (!OSX_SNOW_LEOPARD)
 [o_window setCollectionBehavior: 
NSWindowCollectionBehaviorFullScreenAuxiliary];
 
-[self setupEqualizer];
+[self equalizerUpdated];
 [self resetCompressor];
 [self resetSpatializer];
 [self resetAudioFilters];
@@ -439,19 +439,6 @@ static bool GetEqualizerStatus(intf_thread_t 
*p_custom_intf,
 return false;
 }
 
-- (void)setupEqualizer
-{
-audio_output_t *p_aout = getAout();
-if (p_aout) {
-var_Create(p_aout, "equalizer-preset", VLC_VAR_STRING | 
VLC_VAR_DOINHERIT);
-var_Create(p_aout, "equalizer-preamp", VLC_VAR_FLOAT | 
VLC_VAR_DOINHERIT);
-var_Create(p_aout, "equalizer-bands", VLC_VAR_STRING | 
VLC_VAR_DOINHERIT);
-vlc_object_release(p_aout);
-}
-
-[self equalizerUpdated];
-}
-
 - (void)updatePresetSelector
 {
 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

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

[vlc-commits] macosx: fix memleak, cosmetics

2014-05-24 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Sat May 24 
09:08:53 2014 +0200| [b34dd4b02c8beacfedcc7e7beed692349d7115f3] | committer: 
David Fuhrmann

macosx: fix memleak, cosmetics

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

 modules/gui/macosx/intf.m |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 199ddc1..8f46abb 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -991,8 +991,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (void)application:(NSApplication *)o_app openFiles:(NSArray *)o_names
 {
-char *psz_uri = vlc_path2uri([[o_names objectAtIndex:0] UTF8String], NULL);
-
 if (launched == NO) {
 if (items_at_launch) {
 int items = [o_names count];
@@ -1004,6 +1002,8 @@ static VLCMain *_o_sharedMainInstance = nil;
 }
 }
 
+char *psz_uri = vlc_path2uri([[o_names objectAtIndex:0] UTF8String], NULL);
+
 // try to add file as subtitle
 if ([o_names count] == 1 && psz_uri) {
 input_thread_t * p_input = pl_CurrentInput(VLCIntf);
@@ -1031,8 +1031,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 }
 
 [o_playlist appendArray: o_result atPos: -1 enqueue: 
!config_GetInt(VLCIntf, "macosx-autoplay")];
-
-return;
 }
 
 /* When user click in the Dock icon our double click in the finder */

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