(cherry picked from commit fd0cff6a)

Conflicts:

	modules/access/dvdnav.c

Ogg can be now: ogx, ogv, oga but we have to keep ogg and ogm for backward compatibility.
(cherry picked from commit 16f240f8)

Conflicts:

	include/vlc_interface.h
Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

Backported [688d48fe] and [68a19d04]

Due to VLC's API changes, no cherry-picks were possible for these commits

(cherry picked from commit e94ab021)

Otherwise, if the interface is hidden behind another window, clicking
the tray icon however many times will request user attention in the task
bar and never actually show the interface. This was confusing and
inconvenient (fixes #2396). This new behavior is consistent with KMail.

It would probably be even better to show the interface on top (instead
of hiding it, then show it on the second click). Unfortunately, while it
does seem possible, I do not know how. For sure, the previous scheme did
not work anyway.
(cherry picked from commit 96db483a)

Otherwise the receiver would -in principle- try to receive RTP on the
next (plus one) even port, whereas the m= line port would be used for
RTCP. We could also pass a=rtcp for the normal even/RTP & odd/RTCP
ports setup, but that can only confuse receivers with no gain.

Note that receivers may not parse the a=rtcp parameter in any case. In
fact, VLC does not parse the a=rtcp field to this day. In any case,
sending RTP to an *even* port is the only safely interoperable option.
(cherry picked from commit ca15fe09)

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

macosx: display only information on the currently playing item instead of the item selected in the playlist

(cherry picked from commit aa835660)

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

(cherry picked from commit dfbb9b5e)

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

additionally, the wizard now remembers the last selected encap format correctly
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

Code by fpostma on the forum - fpostma __ xs4all | nl
Thanks to Lorni for testing.
Close #2022

Backport of [910e28a1], [5ba06d3f], [aedd9391], [ab7639bd] and [6de3db02]

default aac-profile to low instead of main
(cherry picked from commit 397a4949)

It should be safe(?).
It actually works better than ffmpeg except that seeking without
index does not work.
It was used anyway for .rm file.

It fixes:
 - a bunch of array overflows
 - a bunch of non checked malloc.
 - pcr value
 - video frame gathering.
 - seeking.

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

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

(cherry picked from commit 07dc019f)

Conflicts:

	modules/codec/avcodec/fourcc.h

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

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

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

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

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

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

Signed-off-by: Christophe Mutricy <xtophe@videolan.org>