As I understand this has been a temporary workaround for libvlccore, which seems to have been resolved.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit ee25a62a)

New protected field bool PLItem::b_is_node to have the data at hand.
Then only check this field in PLModel::flags().
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 968dd88a)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 0ce4275a)

Current description on default mode ain't actually any good, but didn't
find better from x264 commit-log. Feel free to add better description.
(cherry picked from commit 9353b582)

Rename types and add compatibility macro for old libass versions.
Signed-off-by: Laurent Aimar <fenrir@videolan.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Cherry-picked from e8189268

contrib: added debug to see what we're actually doing when changing the prefixes of the included binaries

(cherry picked from commit b5a844bc)

(cherry picked from commit 47648bd4)

Add:
- http-user-agent
- ps-trust-timestamps
- vout-event
And some rtsp options (username, passwd)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 8d58d014)

(cherry picked from commit 18616970)

(cherry picked from commit f59b8d8a)

(cherry picked from commit d23fec0d)

(cherry picked from commit d6fb22b90ee4a6842a7c63edd19c119b80f04227)

(cherry picked from commit 993fe206c2d56ebc6664073413e100ee359c0615)

(cherry picked from commit d17b37cf)

(cherry picked from commit a924dfab)

Conflicts:

	modules/gui/skins2/controls/ctrl_list.cpp
	modules/gui/skins2/controls/ctrl_tree.cpp

(cherry picked from commit c4382505)

(cherry picked from commit 269a815d)

This partially reverts f1175e71.
(cherry picked from commit d02001eb)

(cherry picked from commit 23414d63)

(cherry picked from commit 29b00f3f)

(cherry picked from commit 5f9fc1ca)

(cherry picked from commit cd5c7ace)

...rather than extension (if any). Fixes: #3016.
Also make the code a bit more generic.
(cherry picked from commit 2037bb71)

Pointed-out-by: Taylor Venable
(cherry picked from commit fef190ef)

If you setSortingEnabled after setting model, it doesn't call sorting,
otherway around it does. Missed thatone on previous try.

(Cherry-picked from commit 28b4ac7c)

This should be more clearer to user what column is used to sort (eg if
it's hidden, then hide sortIndicator also).
(cherry picked from commit 9577d830)

macosx: prepare the switch from dyld to 'Dynamic Loader Compatibility Functions' as partially intended by [7147338b]

Using Apple's legacy object file image functions around NSModule is strongly discouraged and won't work in the future at all.

This reverts commit 7147338b.

it checks table of frequencies that usually contains channels. Thou
dvb-c users need to check if modulation and symbol-rate are correct for
them (atleast for me modulation auto didn't work).

example commandline that worked for me:
vlc dvb:// --dvb-srate=6875000 --dvb-modulation 128

Thisway playlist don't run sort when created (in case of you start vlc,
and don't set playlist visible then adding stuff. When you open playlist
it would sort the stuff).

Also remove showing sort-indicator incorrectly on start (don't show
it at all before user clicks to sort).