vlc/vlc-2.1.git
2 years agoUpdate NEWS master 2.1.6
Jean-Baptiste Kempf [Thu, 26 Feb 2015 20:25:44 +0000 (21:25 +0100)]
Update NEWS

2 years agodemux: ogg: check packets header size (fix #13875)
Francois Cartegnie [Thu, 12 Feb 2015 10:17:22 +0000 (11:17 +0100)]
demux: ogg: check packets header size (fix #13875)

(cherry picked from commit 0b37fc45954b2da51e452bb7111f32fa61d8edc5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years agoPrevent potential null pointer dereference in zip access
Gabriel de Perthuis [Mon, 15 Sep 2014 10:35:46 +0000 (12:35 +0200)]
Prevent potential null pointer dereference in zip access

Close #12149

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 3c53c13138225c4b2414ab8358847197cf29b718)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years ago2015
Jean-Baptiste Kempf [Sat, 24 Jan 2015 08:54:31 +0000 (09:54 +0100)]
2015

Still alive!

(cherry picked from commit d8976582c45911a2ca4125854cd85780721184e9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years agoSRTP: integer overflow
Rémi Denis-Courmont [Sat, 15 Nov 2014 10:49:22 +0000 (12:49 +0200)]
SRTP: integer overflow

(cherry picked from commit e76f990e0ba00a9f573c23627ecd66cb9ae9bdd5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years agoSRTP: integer overflow
Rémi Denis-Courmont [Sat, 15 Nov 2014 10:47:29 +0000 (12:47 +0200)]
SRTP: integer overflow

(cherry picked from commit ab9f28ff688eae845bc2deb62bf50072d4a4690b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years agoUpdate NEWS for 2.1.6
Jean-Baptiste Kempf [Thu, 22 Jan 2015 13:45:14 +0000 (14:45 +0100)]
Update NEWS for 2.1.6

2 years agostream_out: rtp: don't use VLA for user controlled data
Fabian Yamaguchi [Fri, 5 Dec 2014 12:58:24 +0000 (13:58 +0100)]
stream_out: rtp: don't use VLA for user controlled data

It should fix a possible invalid memory access

When streaming ogg-files via rtp, an ogg-file can trigger an invalid
write access using an overly long 'configuration' string.

The original code attemps to allocate space to hold the string on the stack
and hence, cannot verify if allocation succeeds. Instead, we now allocate the
buffer on the heap and return if allocation fails.

In detail, rtp_packetize_xiph_config allocates a buffer on the stack at (1) where
the size depends on the local variable 'len'. The variable 'len' is
calculated at (0) to be the length of a string contained in a specially
crafted Ogg Vorbis file, and therefore, it is attacker-controlled.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 204291467724867b79735c0ee3aeb0dbc2200f97)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Conflicts:
modules/stream_out/rtpfmt.c

2 years agodemux: mp4: fix buffer overflow in parsing of string boxes.
Fabian Yamaguchi [Fri, 5 Dec 2014 12:52:42 +0000 (13:52 +0100)]
demux: mp4: fix buffer overflow in parsing of string boxes.

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>
Conflicts:
modules/demux/mp4/libmp4.c

2 years agocodec: dmo: avoid null-pointer dereference.
Fabian Yamaguchi [Fri, 5 Dec 2014 14:37:05 +0000 (15:37 +0100)]
codec: dmo: avoid null-pointer dereference.

Check the return value of malloc to avoid a null-pointer dereference.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 229c385a79d48e41687fae8b4dfeaeef9c8c3eb7)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years agocodec: schroedinger: fix potential buffer overflow.
Fabian Yamaguchi [Fri, 5 Dec 2014 14:18:22 +0000 (15:18 +0100)]
codec: schroedinger: fix potential buffer overflow.

The variable len is a raw 32 bit value read using GetDWBE. If this
value is larger than UINT32_MAX - sizeof(eos), this will cause an
integer overflow in the subsequent call to malloc, and finally a
buffer overflow when calling memcpy. We fix this by checking len
accordingly.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 9bb0353a5c63a7f8c6fc853faa3df4b4df1f5eb5)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2 years agomisc: update: fix buffer overflow in updater
Fabian Yamaguchi [Sat, 6 Dec 2014 12:12:38 +0000 (13:12 +0100)]
misc: update: fix buffer overflow in updater

On 32 bit builds, parsing of update status files with a size of
4294967295 or more lead to an integer truncation in a call to malloc
and a subsequent buffer overflow. This happened prior to checking the
files' signature. The commit fixes this by disallowing overly large
status files (above 65k in practice)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit fbe2837bc80f155c001781041a54c58b5524fc14)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agolua: lastfm: fix matching
Francois Cartegnie [Wed, 21 May 2014 15:44:20 +0000 (17:44 +0200)]
lua: lastfm: fix matching

(cherry picked from commit 4553ce6dac0b1aa9a46d6b033eb866581900f722)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoskins2: os2: save and restore FPU cw
KO Myung-Hun [Wed, 10 Sep 2014 08:00:49 +0000 (17:00 +0900)]
skins2: os2: save and restore FPU cw

WinCreateMsgQueue() changes FPU cw but does not restore it. This causes
SIGFPE later.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit c35f6c1be0c06204a7b9787695cfa1150c5e5f90)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agowin32 packaging: do not fail if shared libraries do not exist
Rafaël Carré [Mon, 14 Apr 2014 08:32:05 +0000 (10:32 +0200)]
win32 packaging: do not fail if shared libraries do not exist

(cherry picked from commit 3b33df911c5c9e7d035df6212487c7fa9b70fd66)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agowin32: Unbreak packaging with recent compilers
Luca Barbato [Fri, 8 Aug 2014 14:51:15 +0000 (16:51 +0200)]
win32: Unbreak packaging with recent compilers

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit acb92632bda62d13629f15985bfe9f686ae162dc)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agoWindows packaging: copy all runtime libraries that are possibly needed
Rafaël Carré [Wed, 9 Apr 2014 13:20:40 +0000 (15:20 +0200)]
Windows packaging: copy all runtime libraries that are possibly needed

(cherry picked from commit 44a5b18d94f227cb16db70657d2b6242397f87bc)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agomac codesign: improve signing script
David Fuhrmann [Sat, 30 Aug 2014 14:32:23 +0000 (16:32 +0200)]
mac codesign: improve signing script

- add signing of sparkles autoupdate tool
- directly fail on error
- fix bug preventing signing of VLC binary
- rework validation steps so that it validates frameworks and autoupdate
  tool separately, but then the complete bundle like gatekeeper (using
  --deep option)

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 699533d5b940bad7ddaffff99f31c83da630fd55)

3 years agodecomp: fix heap overflow (fixes #12052)
Rémi Denis-Courmont [Sat, 30 Aug 2014 13:41:53 +0000 (16:41 +0300)]
decomp: fix heap overflow (fixes #12052)

3 years agoextras/macosx: update codesign script for GateKeeper v2 needed to support future...
Felix Paul Kühne [Thu, 21 Aug 2014 17:35:29 +0000 (19:35 +0200)]
extras/macosx: update codesign script for GateKeeper v2 needed to support future OS X releases

(cherry picked from commit 367a9a4764d3acf174c9e3091289df9300a4a1a5)

3 years agoSegmentInfoCommon.h:43:17: error: unknown type name 'time_t'
O. Hartmann [Sun, 27 Apr 2014 17:32:31 +0000 (20:32 +0300)]
SegmentInfoCommon.h:43:17: error: unknown type name 'time_t'

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit aeb7c4c45d003fae1d777787bc264ecef6ad51db)

3 years agoOSS: VLC 2.0 compilation
Rémi Denis-Courmont [Sun, 17 Aug 2014 15:14:17 +0000 (18:14 +0300)]
OSS: VLC 2.0 compilation

3 years agoOSS: select buffer timings
Rémi Denis-Courmont [Sun, 27 Apr 2014 17:22:43 +0000 (20:22 +0300)]
OSS: select buffer timings

This should fix stutter.

(cherry picked from commit c1622c2c6e0e15a38fef723086ca8bf75a75b46b)

3 years agoWin32: use %ls for wchar_t strings
Hannes Domani [Mon, 11 Aug 2014 18:51:22 +0000 (20:51 +0200)]
Win32: use %ls for wchar_t strings

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 63e775d57f411671d429b468b403716ffb7ed1fc)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoWin32: stop stacktrace on nullpointer
Hannes Domani [Mon, 11 Aug 2014 18:49:31 +0000 (20:49 +0200)]
Win32: stop stacktrace on nullpointer

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit a2897b56dc6e8c1bb4e1e705e6a6df97574c01a6)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoWin32: Update greek installer encoding
Jean-Baptiste Kempf [Sat, 9 Aug 2014 02:17:20 +0000 (04:17 +0200)]
Win32: Update greek installer encoding

Close #11850

(cherry picked from commit bbc663985ba166f913369b429cae1d8e8523894a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoOn the road to 2.1.6
Jean-Baptiste Kempf [Sat, 2 Aug 2014 20:40:08 +0000 (22:40 +0200)]
On the road to 2.1.6

Prepare one, just in case

3 years agoavformat: initialize probe data (fixes #11851)
Rémi Denis-Courmont [Wed, 30 Jul 2014 16:05:43 +0000 (19:05 +0300)]
avformat: initialize probe data (fixes #11851)

(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee)

3 years agopuzzle: missing -lm
Rémi Denis-Courmont [Wed, 30 Jul 2014 16:15:23 +0000 (19:15 +0300)]
puzzle: missing -lm

3 years agointeger_mixer: missing -lm
Rémi Denis-Courmont [Wed, 30 Jul 2014 16:13:42 +0000 (19:13 +0300)]
integer_mixer: missing -lm

3 years agoNSIS: welsh: fix quoting
Rafaël Carré [Wed, 30 Jul 2014 09:36:12 +0000 (11:36 +0200)]
NSIS: welsh: fix quoting

3 years agonsis translations: fix quoting
Rafaël Carré [Mon, 14 Apr 2014 09:01:05 +0000 (11:01 +0200)]
nsis translations: fix quoting

(cherry picked from commit 29decd3caab2efcd7faa11006a5e6945fe53810a)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agoContribs: update bluray to 0.5.0
Jean-Baptiste Kempf [Fri, 27 Dec 2013 10:17:31 +0000 (11:17 +0100)]
Contribs: update bluray to 0.5.0

(cherry picked from commit d052d401ece557adbfd65edf9a0d292ea68574f5)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agocontrib: libbluray: depend on FreeType
Sean McGovern [Sat, 26 Jul 2014 16:54:51 +0000 (12:54 -0400)]
contrib: libbluray: depend on FreeType

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit b4aed403ce0c6ac8579ef68d10b71f468508b95e)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agocontrib/harfbuzz: fix OSAtomic calls for AArch64
Felix Paul Kühne [Wed, 22 Jan 2014 14:01:50 +0000 (15:01 +0100)]
contrib/harfbuzz: fix OSAtomic calls for AArch64

(cherry picked from commit df5b4a9db941864d2dead106bc70c03322f31ed8)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agocontrib: harfbuzz: disable icu
Rafaël Carré [Thu, 19 Dec 2013 19:46:35 +0000 (20:46 +0100)]
contrib: harfbuzz: disable icu

icu-config is not suited for cross-compilation

(cherry picked from commit 7f65a8eb0d563de4ff03a6aad5686b88112931ff)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agocontrib: HarfBuzz 0.9.19
Naohiro KORIYAMA [Thu, 15 Nov 2012 12:16:16 +0000 (21:16 +0900)]
contrib: HarfBuzz 0.9.19

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit d326912f6747297d8d81f92191a650ddd2cd4231)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agoFix libmod_plugin undefined __imp_ symbols building for win32
Konstantinos Tsanaktsidis [Thu, 12 Jun 2014 13:34:46 +0000 (13:34 +0000)]
Fix libmod_plugin undefined __imp_ symbols building for win32

When building current HEAD of master for x86_64-w64-mingw32 against current
contribs, compilation fails at libmod_plugin due to undefined symbols of
the form __imp_ModPlug_*. This patch modifies libmodplug in contribs by
adding -DMODPLUG_STATIC to CFlags in the pkg-config file. A bug is also
fixed in the main build system to make sure the CFLAGS are picked up from
this pkg-config file.

This problem occurs because of the following code in
contrib/x86_64-w64-mingw32/include/libmodplug/modplug.h. This code is
present in libmodplug obtained from running "make fetch & make" in the
contribs directory, but not present in the prebuilt contribs obtained from
running "make prebuilt".

 #if defined(_WIN32) || defined(__CYGWIN__)
 # if defined(MODPLUG_BUILD) && defined(DLL_EXPORT)
 #   define MODPLUG_EXPORT __declspec(dllexport)
 # elif defined(MODPLUG_BUILD) || defined(MODPLUG_STATIC)
 #   define MODPLUG_EXPORT
 # else
 #   define MODPLUG_EXPORT __declspec(dllimport)
 # endif

When building for Windows, if MODPLUG_STATIC is not defined, MODPLUG_EXPORT
is defined as "__declspec(dllimport)". On Windows, dynamic symbols are
prefixed with "__imp_", so this causes GCC to adjust the symbol references
to the libmodplug functions accordingly.

This patch therefore adds a patch to contribs for libmodplug's pkg-config
file. It adds -DMODPLUG_STATIC to CFlags, so that when libmod_plugin is
building it will have the correct symbol names.

However, there is also a bug in the build system that needs to be fixed for
this to work. The configure script sets a CXXFLAGS_mod containing the
output of pkg-config for libmodplug, but not CFLAGS_mod. Additionally, the
Makefile.ac for libmod_plugin sets CXXFLAGS when in fact the relevant files
(mod.c) are plain C. Autotools therefore ignores these CXXFLAGS when
generating a makefile.

The solution is to add a macro to configure.ac to set CFLAGS_mod.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 298616dd2bec030956000d1a5e115268e78091e8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Conflicts:
modules/demux/Makefile.am

3 years agowin32 packaging: add missing dependency
Rafaël Carré [Mon, 14 Apr 2014 08:52:42 +0000 (10:52 +0200)]
win32 packaging: add missing dependency

(cherry picked from commit a62bab556fb50cd70be3157e484fa9b11134b3bc)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agonsis danish translation: fix quoting
Rafaël Carré [Tue, 14 Jan 2014 13:43:23 +0000 (14:43 +0100)]
nsis danish translation: fix quoting

(cherry picked from commit a07e33cdf1e747be8c50d692ab5c8b28d687ced9)
Signed-off-by: Rafaël Carré <funman@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Conflicts:
extras/package/win32/NSIS/languages/danish.nsh

(cherry picked from commit 276197cb8b317b71a6c4f6dcf63538142c3d90b3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoWin32: DisplayName should not include the version
Jean-Baptiste Kempf [Tue, 6 May 2014 15:17:59 +0000 (17:17 +0200)]
Win32: DisplayName should not include the version

(cherry picked from commit d066747c9e57494e2e9c8c22a7d18994b946a055)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agonsis: fix typo in french translation
Rafaël Carré [Sun, 20 Apr 2014 19:18:29 +0000 (21:18 +0200)]
nsis: fix typo in french translation

(cherry picked from commit 68ecc0b25c8f677c24b4a53e46a7991c744d7e72)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agonsis: comment languages not known by nsis
Rafaël Carré [Mon, 14 Apr 2014 08:56:58 +0000 (10:56 +0200)]
nsis: comment languages not known by nsis

(cherry picked from commit 5900cada81b99f52c588aeac45f810b299414ffe)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agonsis: Traditional Chinese is named tradchinese
Rafaël Carré [Mon, 14 Apr 2014 08:54:06 +0000 (10:54 +0200)]
nsis: Traditional Chinese is named tradchinese

(cherry picked from commit 713d4f7272090c82a2d0fa3396c4ee70088cc646)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agocontrib/jpeg: use our own download server since ijg.org is blocking downloads with...
Felix Paul Kühne [Thu, 10 Jul 2014 17:57:00 +0000 (19:57 +0200)]
contrib/jpeg: use our own download server since ijg.org is blocking downloads with curl

(cherry picked from commit e712d9a40bfa8982434dc3072ab684e2623b34ab)

3 years agoUpdate PO files for release 2.1.5
Jean-Baptiste Kempf [Sun, 6 Jul 2014 16:50:09 +0000 (18:50 +0200)]
Update PO files for release

3 years agomacosx: correctly reset video-splitter on video effects profile change
David Fuhrmann [Sun, 6 Jul 2014 16:26:22 +0000 (18:26 +0200)]
macosx: correctly reset video-splitter on video effects profile change

(cherry picked from commit 689f67e98f59a74cb55dea8e06e1c66c49416f30)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>
3 years agol10n: NSIS update Serbian
Christoph Miebach [Sun, 6 Jul 2014 07:39:27 +0000 (03:39 -0400)]
l10n: NSIS update Serbian

3 years agol10n: NSIS config and some updates
Christoph Miebach [Sat, 5 Jul 2014 20:18:33 +0000 (16:18 -0400)]
l10n: NSIS config and some updates

3 years agoContribs: update to 2.5.3
Jean-Baptiste Kempf [Sat, 24 May 2014 16:23:43 +0000 (18:23 +0200)]
Contribs: update to 2.5.3

(cherry picked from commit bd5e28889f0f4645d83bcbbb893e4c15b7a45c2d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoUpdate live555 Contribs
Jean-Baptiste Kempf [Sat, 14 Jun 2014 14:40:48 +0000 (16:40 +0200)]
Update live555 Contribs

(cherry picked from commit ddba52206f69bb123bea8ed4d4ada07b3cb1223c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update Ogg to 1.3.2
Jean-Baptiste Kempf [Fri, 4 Jul 2014 19:40:28 +0000 (21:40 +0200)]
Contribs: update Ogg to 1.3.2

(cherry picked from commit 2898d517e05f5f01b52881a0326c7439c8d9e130)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update PNG to 1.6.12
Jean-Baptiste Kempf [Fri, 4 Jul 2014 19:49:04 +0000 (21:49 +0200)]
Contribs: update PNG to 1.6.12

(cherry picked from commit ce32db6caea92daebfb83d5692939798bd8a18ac)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update jpeg to 9a
Jean-Baptiste Kempf [Fri, 4 Jul 2014 19:51:54 +0000 (21:51 +0200)]
Contribs: update jpeg to 9a

(cherry picked from commit cf77bdabac56c0c7ab1bcf1c2233a4133297e935)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoUpdate NEWS
Felix Paul Kühne [Sun, 15 Jun 2014 12:34:28 +0000 (14:34 +0200)]
Update NEWS

3 years agoqtsound: fix variable type
David Fuhrmann [Sun, 15 Jun 2014 12:19:20 +0000 (14:19 +0200)]
qtsound: fix variable type

(cherry picked from commit a0d12d1f0f61de5245b7a860d7383bb95871fa25)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agoqtsound: remove unneeded variable
David Fuhrmann [Sun, 15 Jun 2014 12:17:21 +0000 (14:17 +0200)]
qtsound: remove unneeded variable

(cherry picked from commit 893716e8371827090a14e5a7257ceeb49f9c0933)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agoqtsound: fix crashes and some other issues
David Fuhrmann [Sun, 15 Jun 2014 12:11:43 +0000 (14:11 +0200)]
qtsound: fix crashes and some other issues

- do not misuse a block_t as a plain array
- use correct size of buffers
- do not overwrite buffer pointers of the second block_t, instead
copy the data

close #7886

(cherry picked from commit 070237de4a867f263b5aa4cab0503812ed5d5d67)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agoavcodec: copy correct chroma plane in CopyFromYv12.
Felix Abecassis [Wed, 23 Oct 2013 11:28:27 +0000 (11:28 +0000)]
avcodec: copy correct chroma plane in CopyFromYv12.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 18e124ec4bcb679b17d0425f121106465d3a74f2)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
3 years agoGnuTLS: update to 3.1.25
Jean-Baptiste Kempf [Mon, 2 Jun 2014 15:01:54 +0000 (17:01 +0200)]
GnuTLS: update to 3.1.25

CVE-2014-3466

(cherry picked from commit 3291be91e64d309c36a4b94281d37bb7156b2467)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agoContribs: update libass to 0.11.2
Tristan Matthews [Sun, 27 Apr 2014 14:37:31 +0000 (10:37 -0400)]
Contribs: update libass to 0.11.2

(cherry picked from commit 9d06856d21a87468b6c3708111b5c3ff556a03d9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update libass to 0.11.1
Tristan Matthews [Tue, 25 Mar 2014 18:05:29 +0000 (14:05 -0400)]
Contribs: update libass to 0.11.1

libass is now hosted on github

(cherry picked from commit cf3eec8b6f0dc796f1b85a1c1710f95e485ba59c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update GnuTLS to 3.1.24
Jean-Baptiste Kempf [Sat, 24 May 2014 15:47:43 +0000 (17:47 +0200)]
Contribs: update GnuTLS to 3.1.24

(cherry picked from commit 76c6d083f9e3ae1e8e6c95710027b493ffb3f717)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: Update gpg-error to 1.13
Jean-Baptiste Kempf [Sat, 24 May 2014 15:55:12 +0000 (17:55 +0200)]
Contribs: Update gpg-error to 1.13

(cherry picked from commit 67fc4b9fb66681ebb9735557ee6a8c9d3b6992bc)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update modplug to 0.8.8.5
Jean-Baptiste Kempf [Sat, 24 May 2014 16:04:16 +0000 (18:04 +0200)]
Contribs: update modplug to 0.8.8.5

Finally, a release!

(cherry picked from commit 9b11ab7ad01758a25742600c411bc61db05c4ae8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update PNG to 1.6.10
Jean-Baptiste Kempf [Sat, 24 May 2014 16:12:41 +0000 (18:12 +0200)]
Contribs: update PNG to 1.6.10

CVE-2014-0333

(cherry picked from commit 4bcd83c9546dbb87e6ab931866923da371c49410)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoUpdate NEWS
Jean-Baptiste Kempf [Sat, 24 May 2014 14:46:56 +0000 (16:46 +0200)]
Update NEWS

3 years agoPGS subtitles: use origial frame size (fix #6324)
Arne de Bruijn [Sun, 18 May 2014 21:36:37 +0000 (23:36 +0200)]
PGS subtitles: use origial frame size (fix #6324)

With CODEC_ID_HDMV_PGS_SUBTITLE use codec_{width,height} for
i_original_picture_{width,height} to correctly display
subtitles with a frame size that is different from the
video stream

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 328a034c115dfa9b4ff7b636b8ab90436af6464b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agomacosx: properly store video-on-top state in playlist variable
David Fuhrmann [Thu, 24 Apr 2014 19:35:15 +0000 (21:35 +0200)]
macosx: properly store video-on-top state in playlist variable

Previous code was never called for fullscreen and video-on-top.

close #9999

(cherry picked from commit 495dbc7cb2021d3fed7e2ed075b5b3313da95efd)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agovout_macosx: always set forced window size for the window provider
David Fuhrmann [Thu, 24 Apr 2014 18:46:56 +0000 (20:46 +0200)]
vout_macosx: always set forced window size for the window provider

Also fixes bug for retina displays where events got missed because
stored value is the pixel value, but new one is the point value.
(close #10743)

(cherry picked from commit 9671dce46b6c4337ee2982cfe5cacbda2bc6f445)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agoauhal: increase ringbuffer size by one second
David Fuhrmann [Fri, 25 Apr 2014 16:18:23 +0000 (18:18 +0200)]
auhal: increase ringbuffer size by one second

This will result in approx. 50% utilization
for tta files.

close #11193

(cherry picked from commit de7b556d7e39abeafeb0b042e05bcf5fa1bfaf04)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
3 years agonsis: fix typo in french translation
Rafaël Carré [Sun, 20 Apr 2014 19:18:29 +0000 (21:18 +0200)]
nsis: fix typo in french translation

(cherry picked from commit 68ecc0b25c8f677c24b4a53e46a7991c744d7e72)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agompgatofixed32: check for invalid channels count
Rafaël Carré [Sat, 19 Apr 2014 08:28:56 +0000 (10:28 +0200)]
mpgatofixed32: check for invalid channels count

Make sure the buffer was allocated with enough channels.
This should not happen anymore since transcode now restarts
filter chain on format changes.

Reported-by: William Blough <blough@shell.cs.fsu.edu>
(cherry picked from commit a113b849e428b71813a569021bd10d6974f6621f)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agotranscode: fix logic/code when reinitialize filter on channel/rate change
Ilkka Ollakka [Mon, 28 Oct 2013 16:47:37 +0000 (18:47 +0200)]
transcode: fix logic/code when reinitialize filter on channel/rate change

Only check samplerate and physical_channels for now

(cherry picked from commit 26989ea2d98380eef28843ffa8ca490e8f9d6dae)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agotranscode: check if input has changed before sync check
Ilkka Ollakka [Sat, 23 Nov 2013 11:04:03 +0000 (13:04 +0200)]
transcode: check if input has changed before sync check

(cherry picked from commit 39a99d25872f64dacd470fda86ba2193a55cda52)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agotrascode: reinit audio filters if audio format changes in midstream
Ilkka Ollakka [Sun, 22 Sep 2013 09:24:52 +0000 (12:24 +0300)]
trascode: reinit audio filters if audio format changes in midstream

(cherry picked from commit a3a150b91f09620dc0d81c22db591a20faf4b2a5)
Signed-off-by: Rafaël Carré <funman@videolan.org>
3 years agokva: support ZOOM
KO Myung-Hun [Sun, 6 Apr 2014 11:53:26 +0000 (11:53 +0000)]
kva: support ZOOM

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

Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agol10n: NSIS config and some updates
Christoph Miebach [Sun, 13 Apr 2014 14:18:10 +0000 (10:18 -0400)]
l10n: NSIS config and some updates

3 years agoAdd missing argument to fcntl(F_DUPFD_CLOEXEC)
Rémi Denis-Courmont [Sat, 12 Apr 2014 08:35:31 +0000 (11:35 +0300)]
Add missing argument to fcntl(F_DUPFD_CLOEXEC)

(cherry picked from commit 25d5ddb5053f98f4f73f24f853a5ebdf9ce60173)

3 years agocontrib/jpeg: use our own hosting since their servers blocks downloads with curl...
Felix Paul Kühne [Sat, 22 Mar 2014 14:36:01 +0000 (15:36 +0100)]
contrib/jpeg: use our own hosting since their servers blocks downloads with curl (close #11048)

wget and mainstream web browsers are not affected.

(cherry picked from commit 2e4af36981bdee565172366ef10d7af86ba90077)

3 years agol10n: Update and add NSIS localizations
Christoph Miebach [Fri, 28 Mar 2014 14:00:55 +0000 (10:00 -0400)]
l10n: Update and add NSIS localizations

3 years agomacosx: do not handle triple clicks explicitely
David Fuhrmann [Tue, 25 Mar 2014 18:05:23 +0000 (19:05 +0100)]
macosx: do not handle triple clicks explicitely

refs #11061

(cherry picked from commit c877b353969c78b7e98b71a8e5cdf0013ec03826)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>
3 years agomad: robustify against corrupt byte streams (fixes #10726)
Rémi Denis-Courmont [Thu, 20 Mar 2014 20:13:23 +0000 (22:13 +0200)]
mad: robustify against corrupt byte streams (fixes #10726)

(cherry picked from commit 9cd0bbb7e80d34ba0c0f7e1c337243678bce45b1)

3 years agodemux: Fix XSPF xml:base parsing (fixes #5697)
Anatoliy Anischovich [Sat, 15 Mar 2014 20:42:28 +0000 (22:42 +0200)]
demux: Fix XSPF xml:base parsing (fixes #5697)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 17dd86ef1d3a6244b2817b14ca3b390bfc50201f)

3 years agoXCB/window: fix potential use-after-free
Rémi Denis-Courmont [Sun, 16 Mar 2014 09:54:23 +0000 (11:54 +0200)]
XCB/window: fix potential use-after-free

(cherry picked from commit bd341a98366bab7b922390c278789c615b1b6f5c)

3 years agomacosx: robustify playlist table columns initialization
David Fuhrmann [Thu, 13 Mar 2014 18:06:58 +0000 (19:06 +0100)]
macosx: robustify playlist table columns initialization

Unknown columns might occur if the prefs are written
by a newer VLC version.

close #10664

(cherry picked from commit 2d39e8f9ab2a2b24bc5703a070feeb94d0f8c4f2)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>
3 years agoavcodec: allocate more hardware surfaces for H.264 decoding
Felix Abecassis [Thu, 6 Mar 2014 11:50:19 +0000 (12:50 +0100)]
avcodec: allocate more hardware surfaces for H.264 decoding

Adapted from 47a9e86e839b455ba256ee89c141298c754d5524 to avoid ABI break.

3 years agodxva2: check number of surfaces to allocate is not larger than the upper bound
Felix Abecassis [Tue, 4 Mar 2014 14:22:01 +0000 (15:22 +0100)]
dxva2: check number of surfaces to allocate is not larger than the upper bound

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit fe573d25f0c5c640e822671e561013ae8f3a069e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agodxva2: remove useless variable
Felix Abecassis [Tue, 4 Mar 2014 14:22:00 +0000 (15:22 +0100)]
dxva2: remove useless variable

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 40420d96a642e2721d24ea5129aa6fe71cb3220a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agodxva2: fix incorrect return value
Felix Abecassis [Tue, 4 Mar 2014 14:21:59 +0000 (15:21 +0100)]
dxva2: fix incorrect return value

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit e3dfdba27fbba5f83bb8101e040b36e2480b03cf)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoauhal: correctly fix channel ordering by setting the correct scope.
David Fuhrmann [Thu, 27 Feb 2014 21:12:34 +0000 (22:12 +0100)]
auhal: correctly fix channel ordering by setting the correct scope.

fixes #10125, #10199

(cherry picked from commit a748266bfbe9d8671db2edd0c454697a6acfbc70)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>
3 years agomacosx: package libvlc_version.h, not libvlc_version.h.in.
Jerome Forissier [Tue, 4 Mar 2014 15:03:30 +0000 (16:03 +0100)]
macosx: package libvlc_version.h, not libvlc_version.h.in.

Copy LibVLC headers from the installation directory: $(prefix)/include
rather than from the source directory, where the version file is still
unprocessed.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 3c9463627d55d5e3f21f26eada40eaa137d8eca5)

3 years agoContribs: update GnuTLS to 3.1.22
Jean-Baptiste Kempf [Tue, 4 Mar 2014 09:31:02 +0000 (10:31 +0100)]
Contribs: update GnuTLS to 3.1.22

See CVE-2014-0092

(cherry picked from commit ec78f3219473d150c2c0f5039fbcdf8d0ddc4346)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoContribs: update libav/FFmpeg hash for DxVA
Jean-Baptiste Kempf [Mon, 3 Mar 2014 13:27:05 +0000 (14:27 +0100)]
Contribs: update libav/FFmpeg hash for DxVA

Includes Anton's fix: d1f9563d

Close #9665

3 years agoqtcapture: fix compilation failure from the future
Felix Paul Kühne [Fri, 23 Aug 2013 12:37:11 +0000 (14:37 +0200)]
qtcapture: fix compilation failure from the future

(cherry picked from commit 4bdb5ffc48b6ba95e4323ffc7086d2c490d35d62)

3 years agoqtsound: fix compilation failure from the future
Felix Paul Kühne [Fri, 23 Aug 2013 12:37:30 +0000 (14:37 +0200)]
qtsound: fix compilation failure from the future

(cherry picked from commit 9f4b3c59ddbac2790c8dd793064b7684b9e344db)

3 years agoQt: convert: don't enforce container extension (fix #9282)
Jean-Baptiste Kempf [Fri, 28 Feb 2014 17:07:30 +0000 (18:07 +0100)]
Qt: convert: don't enforce container extension (fix #9282)

(cherry picked from commit 82d7c41a88adb9fd85d956c949876315871eb138)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agolibvlc: fix possible free() of static const char[]
Jerome Forissier [Thu, 27 Feb 2014 15:53:24 +0000 (16:53 +0100)]
libvlc: fix possible free() of static const char[]

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit c88cf59b9da0d13559e0c63fb63a3fd7f1bd867a)

3 years agoos2: make high-memory safe
KO Myung-Hun [Thu, 27 Feb 2014 04:06:59 +0000 (13:06 +0900)]
os2: make high-memory safe

Some OS/2 APIs are not high-memory safe. So there are needs to use wrapper
functions to make them high-memory safe.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 8a62913aa35ed91c415c531ad7d5876e75b6dc1b)

Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
3 years agoconfigure: add -Zhigh-mem linker flag for OS/2
KO Myung-Hun [Thu, 27 Feb 2014 04:06:58 +0000 (13:06 +0900)]
configure: add -Zhigh-mem linker flag for OS/2

When converting 1920x1080p mp4 using x264, x264 complains that it failed
to allocate memory. This flags makes it happy.

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

Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>