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

- Remove black lines below podcast controls
- fix uncentered dropzone when starting native fullscreen, by slightly
  increasing the min height
- fix disappearing or uncentered dropzone when changing between
  normal and minimum view quickly
- consolidate dropzone and podcast sizings in interface builder

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

This image was set, but it is not overwritten by its os-dependent
counterpart in code. In fact, we only have one image, so just unset
the alternate image in xib.

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

This especially fixes the -on graphics.
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>
(cherry picked from commit 26fde7655abc8f91eddfc971ed1e21d19fbf7edc)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

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

Loading the open nib can take some significant time, due to audio/
video devices enumeration.

refs #12123

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

close #12014

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

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

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

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

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

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

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

This also cleans up the images structure inside the project.

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

Conflicts:
	modules/gui/macosx/StringUtility.m

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

Now, new root folders are created for yosemite, with the naming
scheme mainwindow_yosemite. All icons have the prefix ys-.

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

Also renames 4 yosemite graphics to match the existing naming.

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

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

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

(cherry picked from commit 9bf41d6aeb35a121ce9c96adb21852ca69eb106b)

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

fix mediacodec with android-L on Nexus 7v2.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 6e2f49095619d027ba99020076b0aedc6cde7afe)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

This should avoid the issues of packaging libgcc_s_sjlj-1.dll,
libwinpthread-1.dll and the like.

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

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 863f851833eab0c4a2b5de354bbf50270a5d8d2b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

The subpicture reset, as stated in the comment, is only required when
rendering text-subtitles. In fact it causes an invalid image to be generated
and possibly output in non-text mode. Hence disable the picture recreation for
non-text mode.
Signed-off-by: Julian Scheel <julian@jusst.de>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 47012982d20cf537fc710edd14c9c9c4183d0a19)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Conflicts:
	contrib/src/speexdsp/rules.mak

(cherry picked from commit af3eeea5af09938d1f90c46f048137156c531327)

(cherry picked from commit 88ab8def21e117704335a800cfbe5e08baf1edd7)

(cherry picked from commit fb63f1cc675c5302628ad2fec033ac2472107085)

This ensures that subpictures blending works, and avoids copying back
video frames from GPU to CPU. For proper hardware acceleration,
use libvlc_media_player_set_xwindow() instead.

(cherry picked from commit 86796e2a57adcf5daea9d182c4378e49b40a7f47)

(cherry picked from commit e8ab8fb6b40d315632da311de7a2e03002a528c5)