Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

works with transform filter now too, fixes #7437 again.
(cherry picked from commit 0330378c55b8b940f6de82adb59cc32c5b3da12a)

This reverts commit 4087c7c0.

(cherry picked from commit 97e88867dde80bfd90e4d1c42d08bde34e1314e3)

(cherry picked from commit 6eaec7cb6995c4f7c7a12d3c9e9fd6b05a446230)

(cherry picked from commit cd1e58d9d37bc97bd4981faaa075e9d13c75bc3b)

Conflicts:
	modules/access/dtv/linux.c

(cherry picked from commit 1c858fbdf23e7bfc93bcab47193ce5100cd61e7a)

(not cherry-picked from 374fc686a22063c060d36582f0e90ab1a57ab33e)

Reported by: Rainer Hurling
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 7751dc1fb827256b226fe49bd99fe6a5f37f5c8a)

Reported-by: Aliz Hammond
(cherry picked from commit ee86514d1cb1fe5ec25c8bdfb2a4b6a8d98591e7)

(cherry picked from commit 744121f4461e064e2f26f406c64c9091c95d5e43)

FT_Face.family_name can be NULL for embedded fonts.

See also http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_FaceRec
(cherry picked from commit d96f6e23adfd24ec188cb2a7b31cc2e992291172)

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

(cherry picked from commit 94d4f4a69c9c424ab1f782b6e5461a9eed16bb41)

(cherry picked from commit a44da88b77a1fe47f5e49c11106261d8b50315f8)

Conflicts:
	modules/gui/macosx/playlistinfo.m

(cherry picked from commit 6c62d7475dce83cbc116f4bcc470ee4f9078e6c1)

Conflicts:
	modules/gui/macosx/intf.m

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

Some RTSP implementations (Foscam H.264 IP cameras) return HTTP/1.1 501 Unimplemented on OPTIONS requests. Don't fail out in this case; just continue and assume GET_PARAMETERS is unsupported.

I have a Foscam h.264 IP camera with a very strange RTSP-over-HTTP
server, and I wanted to get VLC to play it back.  Here's the patch
to VLC; I also had a patch committed to live555 to resolve a few
other issues, and that's available in live.2012.09.13.tar.gz.  Do I
need to submit a patch to contrib/src/live555/rules.mak to pick that
new version up?  Or is there a special process for that?  Or should
I just wait a little bit?  :)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 31180356048402d449f4ee765da20e67ff7e8005)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 2c5ee1707b1962ee3f47dbe4abb7c199aeccc022)

(cherry picked from commit eeb201b9b0823b88b69372ced5f674cba66a461f)

(cherry picked from commit c1157eb5cc71a6c1c2210957bcc7f9cc0c744d6a)

(not cherry-picked from f8e940016f9d710ebfafe8e3898fe591dd9c76c2)

(cherry picked from commit 50fe8e1180d012caf19d421229143344d4242405)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit 9002730fbd83123aae1f69f162e4275f595f9f9e)

Conflicts:
	modules/demux/mkv/matroska_segment.cpp

(cherry picked from commit d83bc62511663138a20d1a9f66b0d8a442421148)

Conflicts:
	modules/audio_output/file.c

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

reported by eartle

macosx: fixed Reveal-in-Finder for eastern european umlauts and probably other characters without a ISO-Latin fallback (close #7631)
(cherry picked from commit bd544fff4fa8186436a2792aed375d08a82f635f)

Conflicts:
	modules/gui/macosx/playlist.m

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

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

(cherry picked from commit cf2106da2cae9ea158c2aec59ccb0c0754a8688b)

Conflicts:
	contrib/src/gcrypt/rules.mak

Suspension should not occur during playback. However, it can happen
while the stream is starting. In that case, forgetting the
synchronization informations is more harmful than good.
(cherry picked from commit ac1d1616c9814e9bae1588c60bc256dc3e15508c)

(cherry picked from commit ce87f749aef0db130f494fb8d8e9e2653e0be4f5)

Conflicts:
	modules/audio_output/pulse.c

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

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