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

This solves long-standing conflicts with homebrew as well as the latest Xcode releases. Additionally, in most cases, all 3 items were built anyway.

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

The cone does not really fit and looks ugly. Instead, use the
broadcast icon for all internet-related sd's and local icon for
devices category.

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

For resumption we need to rely on the "time" variable instead of
"position", as the total duration of the file might not have been
set yet.

Also simplifies the code.

close #11981

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

Why be consistent, Qt?

Close #12671

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

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

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

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

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

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

The item-change callback might be called very often, and thus an
own code path is better, with only necessary updates.

Additionally, this fixes multiple resume playback dialogs occuring
at once when starting playback in certain situations.

refs #11981

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

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

(cherry picked from commit 0b9f0d211699248112818b50e5b68d22c996cf3f)

(cherry picked from commit aede137f9aedbfacec351bbbeba13bdb5e210ba1)

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

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

Fail if GetVlcChromaFormat return 0.
(It'll throw a HardwareAccelerationError)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 40aa75316d6f3edc457354ac26295e292a8b1f9f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

- Fix possible infinite loop with sw rendering if GetOutput failed.
- Don't return a pic and don't release the block in case of error_state.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit ab4c04f2f5545dcc3cae7ebffe8d28f3e2c5a915)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

In android-ndk10c, there is a "arm_neon.h" for all archs. The arm_neon.h for
x86* contains correspondence between neon and sse. In speexdsp, There is a
conflict between resample_sse.h and resample_neon.h. So disable neon if arch is
known to don't have neon.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit ef98e81ff014175fd7494c8313de8883d15834b3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 5027938fb4965bca2d3e11ad1c17ca7aecaed258)

(cherry picked from commit d65920ce6607fb24a22e7645b5fd1d03e9e5cfdc)

...not just the visible part. So that cropping still works even though
the visible part of the input and output format typically do not match.

(cherry picked from commit 44d4685b1ca4d1b58c4ce77d479103d482be5d14)

Conflicts:
	modules/video_chroma/swscale.c

(cherry picked from commit d3de0ffc472ddaf38fe6ba20f05071742ad8d86b)

Closes #11878

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

(cherry picked from commit bdd6d80e23f3358c887215fb0497dff79b799e09)

Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>
(cherry picked from commit def33da534a93e67f251d31057a3d503febb9754)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

(cherry picked from commit 52b64b0567338913bc43a4e013ad20f2bbda8be3)

(cherry picked from commit afa9344cb8c479503aaacbd6605a89c4a0e3026b)

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

Close #12400

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

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

In android-ndk10c, there is a "arm_neon.h" for all archs. The arm_neon.h for
x86* contains correspondence between neon and sse. In speexdsp, There is a
conflict between resample_sse.h and resample_neon.h. So disable neon if arch is
known to don't have neon.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit ef98e81ff014175fd7494c8313de8883d15834b3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Folder URLs are likely DVD or bluray folders, which cannot be resumed
properly. Also fixes memleak, and unify guards. Do not save position
for input items which we do not resume afterwards anyway.

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

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

macosx: slightly de-uglify the VLC description in the about dialog by rendering it in the system's default font instead of Times

(cherry picked from commit a8994ec08542bf0954e67dccf1d47657adaf4570)

(cherry picked from commit 19bbb8cc2c0aacc176ac83dc7a57fe94407e9ef4)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

(cherry picked from commit 2b6a8709c5282bf40b3667376d7e67b6ca46b262)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>