Commits · 6531f87c40d0964f979cc82cc00713a0129e2ee7 · videolan / vlc-2-2

09 Dec, 2014 1 commit

Jean-Baptiste Kempf authored Nov 11, 2014

(cherry picked from commit 6badf29945bd34120dc54461a9d4b96510c4e7c8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

6531f87c

08 Dec, 2014 1 commit

demux: mp4: fix buffer overflow in parsing of string boxes. · 91446240

Fabian Yamaguchi authored Dec 05, 2014

We ensure that pbox->i_size is never smaller than 8 to avoid an
integer underflow in the third argument of the subsequent call to
memcpy. We also make sure no truncation occurs when passing values
derived from the 64 bit integer p_box->i_size to arguments of malloc
and memcpy that may be 32 bit integers on 32 bit platforms.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 2e7c7091a61aa5d07e7997b393d821e91f593c39)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

91446240

07 Dec, 2014 2 commits

Revert "contrib: use speexdsp 1.2rc2" · 9e7bb77e

Tristan Matthews authored Dec 07, 2014

This reverts commit 67066bf6dccc61ff15b6385dd80451a025a5217d and
1a2780cbbc0ab64dacfedd132f1d95aecf3df45d as there are still some
upstream issues to resolve.

(cherry picked from commit c203a9083932ce7004d22a67d50c897a28921e07)

9e7bb77e

contrib/speexdsp: fix compilation broken in 67066bf6dc · 8a28984f
Felix Paul Kühne authored Dec 07, 2014
```
(cherry picked from commit 1a2780cbbc0ab64dacfedd132f1d95aecf3df45d)
```
8a28984f

06 Dec, 2014 2 commits
- contrib: use speexdsp 1.2rc2 · 37b095e3
  Tristan Matthews authored Dec 06, 2014
```
(cherry picked from commit 67066bf6dccc61ff15b6385dd80451a025a5217d)
```
  37b095e3
- contrib: use speex 1.2rc2 · b12194c9
  Tristan Matthews authored Dec 06, 2014
```
(cherry picked from commit b7c4173cb7cb5a4a8656abb4f1a59de6209562dd)
```
  b12194c9
03 Dec, 2014 8 commits

MacOS: fix build · 6107c85a
Jean-Baptiste Kempf authored Dec 03, 2014

6107c85a

VLSub: minor fixes · 036010ee

Jean-Baptiste Kempf authored Dec 02, 2014

(cherry picked from commit 0e2d8cd6f687004c4a53ec66b14992e2e0fea76c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

036010ee

Winstore: allow SetThreadPriority call · ad137637

Jean-Baptiste Kempf authored Dec 03, 2014

This mandates 8.1 though

(cherry picked from commit daaa3c659102b9bdff731e632fa42eefde268fd0)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

ad137637

Messages: add AndroidPrintMsg cb for Android · 94df30dc

Thomas Guillem authored Dec 02, 2014

On android 5.0, PrintMsg blocks on fprintf when stderr is locked by flockfile.

This commit adds a default log callback for android in order to fix this issue,
and in order to have early logs (before libvlc_log_set is called).

Close #12870
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 1df6e651c0a46a99bcc99a66f98c7277d84aff16)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

94df30dc

Qt: fix compilation · af9c39d9
Jean-Baptiste Kempf authored Dec 03, 2014

af9c39d9

freeaddrinfo: rewrite as iterative · 831d7979

Rémi Denis-Courmont authored Dec 03, 2014

(cherry picked from commit 4716a65fc63c00a3970f65848ce3d94809d22ef0)
Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

831d7979

libstream_out_standard_plugin: fix linkage on OS/2 · de5943f9

KO Myung-Hun authored Dec 03, 2014

Move freeaddrinfo() to compat/.

-----
  CCLD     libstream_out_standard_plugin.la
weakld: error: Unresolved symbol (UNDEF) '_freeaddrinfo'.
weakld: info: The symbol is referenced by:
    P:\tmp\ldconv_libstream_out_standard_plugin_48c454704dac1660d0.obj
Ignoring unresolved externals reported from weak prelinker.
Error! E2028: _freeaddrinfo is an undefined reference
file P:/tmp\ldconv_libstream_out_standard_plugin_48c454704dac1660d0.obj(ldconv_libstream_out_standard_plugin_48c454704dac1660d0.obj): undefined symbol _freeaddrinfo
-----
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 3180272a56bdb3933219e1cc2c57d0285a7adbd3)
Signed-off-by: KO Myung-Hun <komh@chollian.net>

Conflicts:
	configure.ac
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

de5943f9

os2: enable gnutls · 37e310d3

KO Myung-Hun authored Dec 03, 2014

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit b149f63b2353e19570bac9481ac80fb63f62012b)
Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

37e310d3

02 Dec, 2014 26 commits
- Sync language menus from qt to osx · ef0552ea
  Christoph Miebach authored Dec 02, 2014
  
  ef0552ea
- Add Thai to menu · 6dd4c8b8
  Christoph Miebach authored Dec 02, 2014
  
  6dd4c8b8
- Add Spanish (Mexico) to menu · f0a8287d
  Christoph Miebach authored Dec 02, 2014
  
  f0a8287d
- Add Marathi to menu · c1688889
  Christoph Miebach authored Dec 02, 2014
  
  c1688889
- Add Latvian to menu · 113f3fd0
  Christoph Miebach authored Dec 02, 2014
  
  113f3fd0
- Add Kannada to menu · d2e4c2a2
  Christoph Miebach authored Dec 02, 2014
  
  d2e4c2a2
- Add Bosnian to menu · 7d9f6b1a
  Christoph Miebach authored Dec 02, 2014
  
  7d9f6b1a
- Add Bengali (India) to menu · 26066f60
  Christoph Miebach authored Dec 02, 2014
  
  26066f60
- Add Asturian to menu · bc16ebb1
  Christoph Miebach authored Dec 02, 2014
  
  bc16ebb1
- Add Aragones to menu · a3ab3bc1
  Christoph Miebach authored Dec 02, 2014
  
  a3ab3bc1
- l10n: Traditional Chinese update · 1c2e95a1
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  1c2e95a1
- l10n: Simplified Chinese update · 34af750e
  Dean Lee authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  34af750e
- l10n: Ukrainian update · 32bb8314
  Andriy Bandura authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  32bb8314
- l10n: Turkish update · 360b8302
  Kaya Zeren authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  360b8302
- l10n: Swedish update · a9224e38
  A. Regnander authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  a9224e38
- l10n: Serbian update · 8d09fde0
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  8d09fde0
- l10n: Slovenian update · 38a8747b
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  38a8747b
- l10n: Slovak update · b26169da
  Marián Hikaník authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  b26169da
- l10n: Portuguese update · 38b16ddc
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  38b16ddc
- l10n: Polish update · 58aeffc6
  Michał Trzebiatowski authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  58aeffc6
- l10n: Dutch update · 80924503
  Thomas De Rocker authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  80924503
- l10n: Malay update · f3a1de61
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  f3a1de61
- l10n: Latvian update · fd865b49
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  fd865b49
- l10n: Korean update · 8f61d670
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  8f61d670
- l10n: Kannada update · 3feac1db
  VideoLAN authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  3feac1db
- l10n: Italian update · a6d7d7e1
  Vincenzo Reale authored Dec 02, 2014
```
Signed-off-by: Christoph Miebach <christoph.miebach@web.de>
```
  a6d7d7e1