This bug is already fixed differently in the main line.

Please keep in mind that that the media player in the VLC media player brand is always written in lower case.

Additionally, this change includes minor wording improvements for the German translation.

A relative jump of +1 is the same than 0, we need +2 to skip the next
instruction.
Use named label so it is more clear than +2.

Read the InstallDir regkey, "" points to vlc.exe
(cherry picked from commit b0c000c5883225d0edb4f268d967c77d07254dce)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

That future version is expected to remove a number of already
deprecated interfaces, such as CODEC_ID_* or the Snow codec.
VLC still uses these interfaces as of today.
(cherry picked from commit acf159fbabd1ffb7d2368f1224d5e4d732e7f304)

Conflicts:
	configure.ac

Manual cherry-pick of 2ea0e546475dac1dd9032a06937966ed3d115ca9

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

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

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

See http://flac.sourceforge.net/format.html
(cherry picked from commit 6821ffc8efb5e843f677ae2fdae77de0a1743294)

Conflicts:
	modules/codec/flac.c

This reverts commit be1bcb34.
This depends on unbackported changes.

Signed-off-by: Rafaël Carré <funman@videolan.org>

Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit ecfe16669a5df27ad031e51af39d5d6f745d4fd0)
Signed-off-by: Rafaël Carré <funman@videolan.org>

pub   1024D/E58D1ADC 2013-01-21 [expires: 2014-02-03]
      Key fingerprint = 65F7 C6B4 206B D057 A7EB  7378 7180 713B E58D 1ADC
uid                  VideoLAN Release Signing Key (2013)
(cherry picked from commit 0912461365497ab2ef6f80f0949c97b76000588e)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit ecb0421854e16ddb7a32d716a3565440378c5672)
Signed-off-by: Rafaël Carré <funman@videolan.org>

(cherry picked from commit 0a86a76fec01fe495ace7894c4ecb6be32b4fef7)

Conflicts:
	modules/video_output/macosx.m

After OpenDemux reads data using stream_Read(), it writes a '\0' to
the buffer after the newly-read data, but if the stream returned exactly
i_read_max bytes, this '\0' will end up just past the end of the allocated
psz_sdp array (see the call to realloc at the beginning of the loop).
Adjust the realloc call to allocate this one extra byte.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit dee928705dd32839317dca0e77089b02dd720763)

Replace macro with static inline and use bounds checking
(cherry picked from commit b31ce523331aa3a6e620b68cdfe3f161d519631e)
Signed-off-by: Rafaël Carré <funman@videolan.org>

vlc_vout_display.h is installed and depends on it
(cherry picked from commit 3649531c52025d4b564d53ee6914305670cf11c1)
Signed-off-by: Rafaël Carré <funman@videolan.org>

'libvpx' decoder doesn't exist anymore but we continue to disable it anyway
for people building and older version

The following diff provides some fixes for VLC to allow building
with LLVM.
Signed-off-by: Rafaël Carré <funman@videolan.org>

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

Avoid inifite loops and stack explosion when parsing broken files and ignore lvl 1 unknown elements.

Fix #8013
(cherry picked from commit 127c9329ac47fbbf5ff6509b6c8f8c338cba17d9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

If the user has moved the extension dialog, we don't want to re-center it on every single update -- many extensions update their dialogs on every input change, and this behavior can cause the extension dialog to keep re-overlapping with the video, which is very frustrating.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit ad765c21ffe71fe27b3b6a03ebaa878408ba40ee)

Conflicts:
	modules/gui/macosx/ExtensionsDialogProvider.m

For mingw.org, we ship a single dxva2api.h which contains stuff
normally present in dxva.h, so skip dxva.h.
(cherry picked from commit 9aa30ff3ed7abf56fda84b84a90e6644e09fe70c)
Signed-off-by: Rafaël Carré <funman@videolan.org>

Choosing negative values for some of these settings is NOT a good idea if you
want to avoid damaging your ears ;-)
(cherry picked from commit 946e03caf4535916b02886af56d130f8ad586320)

Conflicts:
	extras/package/macosx/Resources/English.lproj/AudioEffects.xib

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

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

(cherry picked from commit 6b2595e68890e5db1b7334098b6f722e2f41a6d8)

Conflicts:
	configure.ac

(cherry picked from commit bec9b75ce8156585bf57642798f3f09d83d189d9)

Conflicts:
	modules/gui/macosx/VideoEffects.m

The left and right arrow keys have not any real advantage / functionality for
the playlist view or sidebar but are used by default for several hotkeys.
So lets allow these as VLC hotkeys (also for audio files).
(cherry picked from commit fc33caea8f87af71454f4aacc0be91c247f21889)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

(cherry picked from commit 05f9c0acdbf2832d507724d644d32aa06c47cf65)

Conflicts:
	modules/video_filter/puzzle.c