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

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

Should fix #6184 as aac encoding seems to require --sout-ffmpeg-strict=-2
(cherry picked from commit a64b15e7be6f8dd3107245802d884baa5a8cf276)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

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

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

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

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

09d1c6e1891cdc914d25279aabdd83c13baab227 was not working...

It fixes #6190.
(cherry picked from commit 1cc7a5c9a45e1d1b54afb310f68e43cdec32dc6f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 1c23e3df85cc362066087ec8727c117dbc19f6e8)

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

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

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

This can happen on some POSIX.2001 systems.
(cherry picked from commit 46f74073685b29544dd55b3494f82e77fe9b4b6b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 2619d2f6a9d2fb47712a01066b7d49aefd6b874b)

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

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

Revert this when you have found the reason why it fails for soo many
people, in avi, mp4 (and mkv before the HACK)
(cherry picked from commit ce85748bd0dcc074d69c71d51ead53968eebeb9e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This patch ensures that, as soon as the user comes back from the filename selection dialog box, the filter is updated accordingly and the expected result (logo insertion or deletion) can be seen right away.
(cherry picked from commit 8fc17f107d6dc63f88cbb6f56279732b0c5d5079)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Commit d858c4 introduces a new macro that is chosen to evaluate if an
element in submenus should be an ITEM_NORMAL or ITEM_RADIO
based on VLC_VAR_ISCOMMAND flag. The conditional results were in
the wrong order.

Close: #6149 #6197
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 3feeb95479ff7b760ecf90869e001d52a53d784d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit 55a47406fd1391b61b85b2051951434741e299a9)

macosx: don't give the user a chance to push the play/pause button when targetting the forward/backward buttons
(cherry picked from commit 67c68a718757f769f896b41115f71c8b1acc902a)

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

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

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

This patch fixes Apple Http Live Streaming of a single stream without bandwith set.
According to the draft RFC, the bandwith parameter is optional. VLC treats this as bandwith zero but
estimates the bandwith based on time it takes to download segments to be able to seek accurately. When
the playlist is updated for a live m3u8, the bandwith value of 0 will cause a new version of the playlist
to be created - effectively stalling the playing stream. This patch makes sure that playlists that do not
specify bandwith reference the same instance.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 0b54d2cb)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

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