Conflicts:

	extras/package/win32/vlc.win32.nsi.in
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Blind commit
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Signed-off-by: Christophe Mutricy <xtophe@chewa.net>

Translation from Xabier Aramendi <azpidatziak@gmail.com>

Signed-off-by: Rémi Duraffort <ivoire@videolan.org>

libavcodec seems to do the same and didn't actually found a reaso earlier
patch did what it did. Copying nals helps if you do slices, so it doesn't
do one nal at a time.

(cherry picked from commit d3dd902828854d30b7b39c5e8147152ec6d63289)

No functional changes.
(cherry picked from commit bb9c9396)

(cherry picked from commit fb46b4a1)

Use highlevel function snd_pcm_recover() the recover from error states.

Read first before using snd_pcm_wait(), just like arecord does.
(cherry picked from commit 4b0e0dcd)