(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>

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

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

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

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

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

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

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

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

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

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

This fixes a bug reported on the forum at
http://forum.videolan.org/viewtopic.php?f=2&t=98332
(cherry picked from commit 0c1f7006)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Note that CDDA module still needs to query freedb service for disc ID,
only the track information is cached.
(cherry picked from commit c95ed812)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

macosx: stop the playback on when closing the main window only if there's a video inside (close #6144)
(cherry picked from commit 4a4848c9)

macosx: resizing fixes for the minimized state. additionally, make sure we restore the state last present on quit. (close #6122)
(cherry picked from commit fa9bc462)

macosx: work-around so we don't block the main thread for ages during launch time without showing a window
(cherry picked from commit b27649e5)

(cherry picked from commit 2eda8d45)