CVE-2012-1126 up to CVE-2012-1144 and SA48320
(cherry picked from commit b737cac8)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

It is redumdant with the preexisting dvb-t scheme and does not even
always select the correct delivery system. Also the failure mode is
much more confusing than a plain error input failure message, and
it is inconsistent with other delivery system names.
(cherry picked from commit 06a2a739)

Close #6180 and #6153

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

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

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

This reverts commit 6afa23b2.
This was breaking length computing, thus breaking seeking.

Conflicts:

	modules/access/bluray.c
(cherry picked from commit 2013440e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

This should fix bluray playback on windows.
(cherry picked from commit 12bb4f9d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This fixes crash with BD-J menu, if libbluray isn't built with java
support.
(cherry picked from commit 3bc5c401)
(cherry picked from commit 96b02891)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
(cherry picked from commit 8a570321)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

If pausing the decoder races with setting up the audio output pipeline,
the decoder can end up already paused when the audio output is created.

The audio output insists on a strict start -> (pause -> resume ->)*
(pause ->)? stop series of state transition. So it must be paused
explicitly in this corner case.

I have not investigated whether this problem affects the video output
but this seems very likely too.
(cherry picked from commit 092e8242)

(cherry picked from commit bb20070a)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

(cherry picked from commit 9df02460)

(cherry picked from commit 42b8a557)

Conflicts:

	modules/access/dtv/linux.c

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

(cherry picked from commit 542b07d3)

note that this patch includes a hack to revert to the 'Default' state correctly
(cherry picked from commit 1d4f6a97)

(cherry picked from commit 50134d94)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>

macosx: allow to hide the drop zone while the playlist is empty using an option-click on the playlist toggle button (refs #6213)
(cherry picked from commit 51cbd1c2)

it behaves this way now:

- no video => toggle window minimization

- active video in main window => toggle playlist / video

- active detached video => toggle window minimization

- active video in main window, option click on button => toggle window minimization
(cherry picked from commit 797ca65c)

(cherry picked from commit 4106e42f)

the playlist item automatically reveals the main window now, in case it is hidden. the close item correctly closes the detached video output window now, when using the gray ui style
(cherry picked from commit 77956b05)

(cherry picked from commit 52d209b8)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

(cherry picked from commit 1cb53037)
Signed-off-by: Sébastien Escudier <sebastien-devel@celeos.eu>

As pointed by fenrir, this is already handled by the core.
(cherry picked from commit aef79d83)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
(cherry picked from commit 6a72420a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h@gmail.com>
(cherry picked from commit 93154b67)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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