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

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

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

(cherry picked from commit 521f40906c11615b9da6fabb19870724b91769fb)
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 06a2a739e76f8c05776be0f84faef049a2505cec)

Close #6180 and #6153

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

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

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

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

Conflicts:

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

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

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

This should fix bluray playback on windows.
(cherry picked from commit 12bb4f9d52832dafb493d0c0241b154cbdce251e)
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 3bc5c401996090ef409d0c76fd59c1d009b80c00)
(cherry picked from commit 96b0289176abe5a24eb1f854e74654b3c55d0574)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

(cherry picked from commit f55a160da54be5e09576947388f5eb60d0d224ff)
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 092e8242e786dfef3568dabd654e3d886c7534f3)

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

(cherry picked from commit 9df024608bdb087f26bff309ddcc9d686e0353d5)

(cherry picked from commit 42b8a557d6f0045c2a3a06a9ff457ce2a9cf7144)

Conflicts:

	modules/access/dtv/linux.c

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

(cherry picked from commit 542b07d310adad4692455396ffa5d52f3fe666b7)

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

(cherry picked from commit 50134d9405852b74a9844e44f154049a91eaef9e)
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 51cbd1c24870eec1b386ee978d4ebcaae4a0ac9e)

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 797ca65c8f545a22d02ed676711e6f254d5b5dc4)

(cherry picked from commit 4106e42f145faa3534788a58fec9d6eae59ae7e0)

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 77956b05910b44ee764815e08c0e5a52a0d984ed)

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

(cherry picked from commit 1cb530379f592f7308fd87b70a0267157894ccea)
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 aef79d832965b10a923aa47b89475ae44bb11b53)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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