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

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

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

Fix error if interrupted in the process
(cherry picked from commit d6411a2a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

(text from the patch author)
On many systems taking couple of kilo-bytes for full sinc table is not
a problem. With a straight filter table the number of MAC operations
needed drops to one quarter. Also the inner loop of the filter becomes
more simple and easier to optimize. So the full sinc table version
runs much faster in most cases. The trade off is some kilo-bytes
bigger memory usage and more CPU needed when initializing the
resampler.
(cherry picked from commit b35a1328)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

from http://lists.xiph.org/pipermail/speex-dev/2011-September/008242.html
(cherry picked from commit 0ef89a6b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

macosx: fixed a crash in the video effects panel if no vout is present and set the slider values as their respective tooltip
(cherry picked from commit 394b188c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

For example crop/pad can change p_enc.in values, so run soverlay
in part that they are actually correct in p_pict.
(cherry picked from commit 82e22a44)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit e423b4ec)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit bf8c4379)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

macosx: make sure that the fullscreen controller is always available when playing a video in lion's fullscreen mode
(cherry picked from commit a9112101)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit bd4d1b69)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This means we don't rebuild() everything with every item when we populate
playlist without search
(cherry picked from commit f043aa0e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

not thread-safe, not available on android
just use '.' as decimal separator
(cherry picked from commit 6309ae8c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Use make install instead of broken rule in a custom script
Close #5891
Also move headers installation from said script to package.mak

We should use make install in the main directory but for some reason
the rule recurses and never ends
(cherry picked from commit 860a7e5c)

Conflicts:

	extras/package/macosx/package.mak
	projects/macosx/framework/Pre-Compile.sh

should fix #4812 for vlc 2
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 9ae00167)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

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

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

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

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

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

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

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

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

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

This reverts commit 4135148b.

It would seem that we need to discuss more about this, before.
Back to the ml.
(cherry picked from commit 21116876)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

fix build with unmodified mingw32
(cherry picked from commit a2f19dcc)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This reverts commit 3c30f52c.

Backporting a bit too  quickly it seems