VLC was getting kicked from the D-Bus when a track was stopped, because
it was generating invalid data on the wire when sending the
PropertiesChanged signal for the Metadata property.

The issue was that if there was now no current track, GetInputMeta would
never be called and the the variant would never be populated with the
"a{sv}" structure that the call to dbus_message_iter_open_container
claimed it would be.

We now share the code that GetProperties used, which dealt with this
correctly, although now both use CurrentInput (which is what the signal
previously used) instead of CurrentPlayingItem (which is what
GetProperties previously used).
Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
(cherry picked from commit 5460e18e20719255d4ed1461594fe72530a19f85)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Rate should never be 0.0 (according to the spec), so we pick a sensible
default when we do not have a current track: 1.0.

Also, when the current item changes, the Rate may also change.  So add
it to the PropertiesChanged signal just to be sure.
Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
(cherry picked from commit 8f754d8715c72abc4ba1b0f26ae136c1db41437b)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Several of these entries, such as xesam:artist, should be lists of
strings, not strings.
Signed-off-by: Mirsal Ennaime <mirsal@videolan.org>
(cherry picked from commit ad8039e3e3b910730e71921b9f8952107644695a)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)