...for good this time (yeah right).
(cherry picked from commit 3e00fa130e30266dcb6b6ae75384ae69d46f50f3)

This happens almost all the time, and is unfortunately normal behavior.
(cherry picked from commit e51fad4ca63581c99a4e7dd663e04e0f5be18d58)

Conflicts:

	modules/audio_output/pulse.c

(not cherry picked from commit 6b43a1d3cdd2047bbe86d0b584e550e1fda060e0)

This should fix the infrequent assertions failures at exit.
(cherry picked from commit 2e09a58d867f214a18c964684712842a971d1919)

Conflicts:

	modules/audio_output/pulse.c

If all activated streams are EOF ones, 'i_stream' was incorrectly set
to p_sys->i_track. Then AVI_StreamChunkSet() crashes.
(cherry picked from commit 2344ab6ae1f2db7e1c079edeecaec410ad52b119)

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

if libvlc users disable both mouse and keyboard events, chances are they're
trying to regain control over them. The WS_DISABLED flag exactly fits this need.

The only thing is that it is an overall flag that doesn't differentiate mouse and keyboard.

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

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

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

The metadata structure would not be zeroed when title or artist were missing
(cherry picked from commit b357472ac5a4887a97909ba8c7d14227ae1d3d8b)
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>

(cherry picked from commit ae3390dc8dc90eab07ef8fff8218939f01aafb60)
Signed-off-by: Rafaël Carré <rafael.carre@gmail.com>

This time, it should work (famous last words).
(cherry picked from commit 7dc50c98a523b9a2dc0e0255868f1a17757c1a10)

Conflicts:

	modules/audio_output/pulse.c

1kHz is way too much for human perception.
(cherry picked from commit a97f3aa7dab9f58b55dbf489677c9a1ab22875f1)

Conflicts:

	modules/audio_output/pulse.c

This unfortunately inserts silence shortly after resuming, right after
the samples that were held in the buffer during pause. This can possibly
be avoided with prebuffering (not tested).
(cherry picked from commit 819065990b37da8491d82c3538eca6b8a4d516f3)

This commit is only backported to ease further backports. Audio output
plugins have no notion of "resuming from pause" in VLC 1.1.

Conflicts:

	modules/audio_output/pulse.c

(cherry picked from commit 37d21af0eb0be93fead5b91fa63e99c01fc9994d)
(cherry picked from commit a21dd90dfd943e6ff6d04fbf8508bef01a38e22d)

Conflicts:

	modules/audio_output/pulse.c

(cherry picked from commit ccb049c1f3e71a5303181e690ac5b06339021bd9)

Conflicts:

	modules/audio_output/pulse.c

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 6b216e7e31a0e11d5fa6f0773bb49644aaa86ab7)

Conflicts:

	configure.ac

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

macosx: fixed rare crash, which could be triggered by optical stream format descriptions output by the auhal module

and fixed a compiler warning

The recent changes to auhal had it using an AudioStreamBasicDescription
array when looking at the stream properties. However, the proper type is
AudioStreamRangedDescription. This patch corrects that, and then accesses
the AudioStreamBasicDescription inside it as necessary.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

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

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

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

(cherry picked from commit 378456a65441a465440a62ee40bfea53ff2d905d)

(cherry picked from commit 72c07065860ad8e70674714532da05e373acdc88)

Plus an extra security check.

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

Optimize for installed VLC rather than running from $(top_srcdir).
This patch does not support relocation, so there is potential for
further improvements.
(cherry picked from commit 09e0d5d7d3c23b61fd225423894a70a15f1925c2)

Conflicts:

	modules/video_filter/Modules.am

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

(cherry picked from commit 25f179e1f61d9a10bcf210c9a1bfe73fae43879a)

(cherry picked from commit 981005b0e1d9c015166280e7509305c5951c1518)