LucasArts SMUSH SANM video decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
LucasArts SMUSH VIMA audio decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
LucasArts SMUSH demuxer

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
fate: add tests for SANM and VIMA

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
pulseaudio: move NULL check up before dereference.

Fixes CID 1197068.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
rtspdec: check for strchr returning NULL.

Fixes CID 732244.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'

* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
  LucasArts SMUSH SANM video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/sanm.c
	libavcodec/version.h

See: 69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'

* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
  LucasArts SMUSH VIMA audio decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavcodec/vima.c

This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav

See: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123'

* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h

See: bef8fd7099edfac9c487e6eb75d7e6116ad80465
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Set Matroska private data when muxing Prores.

The specification requires the mov code point to be written as "fourcc".
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add tests for SANM and VIMA

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/sanm

See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Set Matroska private data when muxing Prores.

Merged-by: Michael Niedermayer <michaelni@gmx.at>