* commit '040c565e':
  doc: developer: Allow tabs in the vim configuration for Automake files
  Remove pointless av_cold attributes in header files

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

Using the table directly may cause problems on some platforms like msvc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b5f536d2':
  pnm: add high-bitdepth PGMYUV support for both encoder and decoder

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

* commit '2f325a6f':
  libx264: change i_qfactor to use x264cli's default
  qtrle: use AV_LOG_ERROR in an error message.

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

* commit '7b4f9115':
  qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1065924':
  qtrle: add more checks against pixel_ptr being negative.

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

* 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>

While we do not use Automake in libav, this allows our config to be
used more globally without introducing unwanted breakage.

The init functions marked as av_cold have to be executed in any case,
so there is no gain from trying to mark paths leading to such functions
as unlikely.

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>

This also allows libx264 to modify its i_qfactor value
when using the "-tune" setting. Previously it had a static
value of 1.25
Signed-off-by: Anton Khirnov <anton@khirnov.net>

CC:libav-stable@libav.org

Avoids crashes with corrupted files.

CC:libav-stable@libav.org

CC:libav-stable@libav.org

CC:libav-stable@libav.org