* commit '4f3b058c':
  cavs: initialize various context tables to 0
  mlpdec: do not try to allocate a zero-sized output buffer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '56daf10e':
  mov: use the format context for logging.
  flicvideo: avoid an infinite loop in byte run compression
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Useful for testing seek implementations.

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

* commit '067432c1':
  loco: check that there is data left after decoding a plane.
  lagarith: avoid infinite loop in lag_rac_refill()

Conflicts:
	libavcodec/loco.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f935aca4':
  av_memcpy_backptr: avoid an infinite loop for back = 0
  4xm: check the return value of read_huffman_tables().

Conflicts:
	libavcodec/4xm.c
	libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The following commit:
b97d61f9 avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
introduced an exception to avoid lossy conversions.
Add a comment to explain the logic.
Fix the call to avoid applying it on audio formats.

Fix trac ticket #2139.

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows more complete checks
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Otherwise even a tiny file can trigger a huge memory allocation.

Related to ticket #2298.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

This significantly reduces the memory needed per AVStream when the
array is not needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket2140
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes second part of Ticket2292
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2292
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Avoids crashes with corrupted files.

CC:libav-stable@libav.org

CC:libav-stable@libav.org

CC:libav-stable@libav.org

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

Also ensure that format is valid in query_formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

When byte_run is 0, pixel_countdown is not touched and the loop will run
forever.

CC:libav-stable@libav.org

CC:libav-stable@libav.org

range == 0 happens with corrupted files

CC:libav-stable@libav.org

CC:libav-stable@libav.org

CC:libav-stable@libav.org

"12:34" is now valid syntax.

In particular, fix warnings:
*** Undefined node `quoting_and_escaping' in @ref (in doc/muxers.texi l. 767)
*** Undefined node `quoting_and_escaping' in @ref (in doc/muxers.texi l. 772)

Fix trac ticket #2258.
Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>