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

(cherry picked from commit 17b4418856ec1cf7862f5c70f767cc8ad2f81971)

(cherry picked from commit 22203a5835c4cb44be70653c94375af309141168)

(cherry picked from commit bd3d52ddece0d319d9c1adaf2e168e555d30ab6c)

needs forward-port and testing on 10.5

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 5f0e2c0921d9ae4c942bfc801e421999d05d602e)
Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

This fixes the problem that a timetooltip does not appear on fullscreen
from the second fullscreen state change.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit d473eeede4ab8b14902be07f330764f42dea181a)
Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Signed-off-by: Christoph Miebach <christoph.miebach@web.de>

Fix incorrect redirection given in "Location: http://host/path "
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit a05aca783e3b2a03f839d2141ee64ee835ebf1cc)

(cherry picked from commit 75d7b6e769325346dede1310d656df73e1b99a6b)

This partially reverts commit 99ebae0c.
(see http://techbase.kde.org/Development/Tutorials/Solid/Device_Actions)
(cherry picked from commit 7df32e49d410253bdbcaf7c7411bde9386c459d8)

(cherry picked from commit 01924381fd15196a68f29d4cc279fb7a42f6f556)

(cherry picked from commit a865ced4888701e8caf0137672a4857c2b0d47d7)

Conflicts:
	modules/video_filter/sepia.c

(cherry picked from commit 18d7c9713c4b42368789961af6bc6345ce1fc6f9)

Conflicts:
	modules/codec/avcodec/copy.c

(cherry picked from commit 485a070fcaa8e6bd7985ce489d5f53edffecfdaf)

This is required by the next commit. This also avoids making two copies
on non-x86 platforms, where USWC optimizations are irrelevant.
(cherry picked from commit 07d8e576c7a0dcc7863d6853f620d5a99ebba55f)

Conflicts:
	modules/codec/avcodec/copy.c

(cherry picked from commit 6f5810a46adfc2e5202ebaf89b54eb89e7b93934)

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

Our custom codec names table lacked boundary checks and was incomplete.
(cherry picked from commit 88846171954a218ca9c401b87b0a4faffb5fc385)

Conflicts:
	modules/codec/avcodec/video.c

(cherry picked from commit 39dc439cf5e3fe83b87078bcf93c13d07fd02dac)

(cherry picked from commit 44819779f94086ea1f21a9649af8d41754fa9ccf)

This could use a bit more testing than a single video
(cherry picked from commit 64e30497fa764f680c2b235757e49f6c83b85028)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit e608d2aa90a733e48cfc58f9be73f2aea8c75c94)

Close #7553
(cherry picked from commit 26015dacd88f21d48bdebeb499dc8f331baacc19)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

macosx: show the localized, intended to be user-facing encoding names instead of the variable values to the user.

This way, s/he is never presented an empty menu item for the default value.

This also closes #7539 by preventing stringWithUTF8String calls with empty strings.
(cherry picked from commit d7246593be4f2484d13adaaf5bd8cbd4c8e5b812)

Conflicts:
	modules/gui/macosx/open.m