* qatar/master:
  xmv: do not leak memory in the error paths in xmv_read_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd1016dcc':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().

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

* commit '8d617b11':
  id3v2: pad the APIC packets as required by lavc.
  dfa: check for invalid access in decode_wdlt().

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

* commit 'dbb14258':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
	libavformat/utils.c

See: 44a7a630Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bcc94328':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

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

* commit '8a96df7b':
  matroska: fix a corner case in ebml-lace parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc43c19a':
  matroska: Update the available size after lace parsing
  clang: use -fsantize=address and -fsanitize=thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

It can be 0 or -1 for invalid files, which may result in invalid memory
access.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

This can happen when the number of skipped lines is not consistent with
the number of coded lines.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

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

Tested-by: Nevcairiel

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

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

* cigaes/master:
  lavc: do not init frame with guessed layout.
  lavfi/af_atempo: simplify request_frame loop.
  lavfi/af_asetnsamples: simplify request_frame loop.
  lavfi/f_ebur128: remove request_frame hack.
  lavfi/vf_tile: simplify request_frame loop.
  lavfi: reindent after last commit.
  lavfi: loop on request_frame if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It is breaking support from files with unknown layout.

Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.

Fixes ticket #2430.

Reviewed-by: Matthieu Bouron

* cehoyos/master:
  Fix make checkheaders without opencl headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '817dff57':
  configure: Check for the atomic.h functions used in the suncc atomics header

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

Regression since a93b572a.

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

* commit 'f9f6402e':
  configure: prettify atomics handling.

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

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

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