(cherry picked from commit 4afbaf587d11e0df32e035309cb7425f754b02c5)
Signed-off-by: Rafaël Carré <funman@videolan.org>

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

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

(cherry picked from commit 3e954c9811e72ef7486be92723bb96f7e5b4af06)
(cherry picked from commit 0f82e032376e3d03f11530745ca4047195d3ba2c)
(cherry picked from commit f559e33ca77317b9c43630bdaf5484ef419fb757)
(cherry picked from commit 67b2f035a8e602c266c9b20f0a48ab8f399b538b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Bored as hell of those crashes...
(cherry picked from commit d84b8db93bce76f078f190505226924c0c4cd3cc)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

Manually backported from af4805700c96f17972ab6d3292404f9248be2b90
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This stops rejecting 0-byte packets, adds checks everywhere we
access the first byte of a packet, updates the th_decode_packetin()
return value checking so that duplicate frames aren't thrown away,
and updates video pts generation so the resulting frames are
displayed correctly,

Fixes bug #3416.
Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 9c7198eaeda34f791fd007287e4089099ed70e22)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This properly handles pre-skip, seeking pre-roll, and end-trim. It
uses the i_nb_samples field of block_t to signal to the decoder how
many samples should be returned after (possibly) skipping some at
the start of the block (for both pre-skip and pre-roll). In
addition, it abuses the i_length field of block_t to signal to the
decoder how many samples to trim from the end of the packet (for
end-trimming).

This patch does not compute correct timestamps for streams which
start at a non-zero offset (e.g., live streams joined in the
middle), nor does it correctly compute the length of a stream. But
neither of those things work for Vorbis, either. I'm leaving them
for a follow-up patch.
Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 675072a8a6a520f79e9892e26ff3be98b069df7a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

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

Only difference seems to be that in ES_OUT_SET_PCR we don't
have msg_Err showing up while playing ogg files
(cherry picked from commit 7ed15b7180e62d9bfdc218ede60f3b5ed4c931a6)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Modified-by: Rafaël Carré <funman@videolan.org>
Signed-off-by: Rafaël Carré <funman@videolan.org>
(cherry picked from commit 7258c97afdf6e8209a1be5c8ce707e6040c38454)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit b68f50f1ff7dc742346fb5a1e0f888e549f0ba91)

(but not the other way around of course)

On OS X, fontconfig searches font only from /System/Library/Fonts, so this patch adds more search paths to its initialization.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 6bad0899)

auhal: fixed audio device configuration callback and added an additional callback to watch the used device's health (close #4834)
(cherry picked from commit 8fbb1fd0)

Conflicts:
	modules/audio_output/auhal.c

This makes sure that the correct header files are checked and used.
That is to say the ncursesw headers as opposed to ncurses.
(cherry picked from commit 65d11fbb)

Conflicts:
	configure.ac

(cherry picked from commit d17ebaf1)

Top crash on Skins2 module on Win32
(cherry picked from commit 9e76fdbc6e1e1243c59126688f23141329f10461)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

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

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

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

extras/package: disable the macosx dialog provider in VLC.app release builds, since it should only be used by VLCKit
(cherry picked from commit 1c76df001e79fe965e20816d8c46c6ed20f45cb5)

Conflicts:
	extras/package/macosx/configure.sh

(cherry picked from commit dfb4fa14a2624885422906176dd0f513cf8a6677)

(cherry picked from commit 42dd17214ba206318057843063236011c940050d)

contrib/bghudappkit: updated xcode4 patch to create an ibplugin, which can actually be used for production

Basically, MACOSX_DEPLOYMENT_TARGET was set incorrectly in the previous patch.
(cherry picked from commit 512b0a37768954aee13f08f55517025c1b230b9b)

(cherry picked from commit 643d29c97c787139a1f8d45c5c756814635d92eb)