* commit '38e15df1':
  avframe: note that linesize is not the usable data size

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

Fixes infinite loop
Fixes Ticket2996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This fixes a infinite loop
Fixes Ticket2986
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes division by zero
Fixes Ticket2992
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Georg Martius <martius@mis.mpg.de>

Found-by: " Geek.Song" <ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

For cases when plugin does not return any samples we just return
input samples. Previously channel layout for outlink was not set.
Set it explicitly instead.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

* qatar/master:
  lxf: check the nb_streams instead of relying on padding

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

* commit 'a529fa2f':
  lxf: remove deplanarization hack

See: 37e2a978Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7e52080c':
  pcm: support 24-bit/32-bit little-endian planar

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/pcm.c
	libavcodec/version.h
	libavformat/nut.c

See: 467dfd5dMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '839df90c':
  lxf: Support 16-channel files
  lxf: Support version 1 files

Conflicts:
	libavformat/lxfdec.c

See: e701b0cf
See: 1a06d6ddMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd872fb0f':
  lavf: Reset the entry count and allocation size variables on av_reallocp failures

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

* commit '06ebc0bf':
  lavf: Allocate arrays with av_realloc if they will be realloced later
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1af78b86':
  rtpdec_qt: Add an accidentally removed allocation return value check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '705b748e':
  tls: Add support for listen mode

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: 4f4eb380Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5c53bf7a':
  http: Pass options through to the nested protocol

Conflicts:
	libavformat/http.c

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

* commit '8b09d917':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858
See: 973a758fMerged-by: Michael Niedermayer <michaelni@gmx.at>

Remove the now unneeded stream pointer while at it.

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

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Used by LXF.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Reported, analyzed and tested by Gabriel Gerard.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

When av_reallocp fails, the associated variables that keep track of
the number of elements in the array (and in some cases, the
separate number of allocated elements) need to be reset.

Not all of these might technically be needed, but it's better to
reset them if in doubt, to make sure variables don't end up
conflicting.
Signed-off-by: Martin Storsjö <martin@martin.st>

Pointers returned from av_malloc can't in general be passed
to av_realloc.
Signed-off-by: Martin Storsjö <martin@martin.st>

This check was mistakenly removed in 5626f994.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also add options for specifying a certificate and key, which can
be used both when operating as client and as server.

Partially based on a patch by Peter Ross.
Signed-off-by: Martin Storsjö <martin@martin.st>

When passing a dict to the nested protocol, it will consume
the used options from it, so a separate copy needs to be used
when reopening the connection multiple times.
Signed-off-by: Martin Storsjö <martin@martin.st>

A file containing the trusted CA certificates needs to be
supplied via the ca_file AVOption, unless the TLS library
has got a system default file/database set up.

This doesn't check the hostname of the peer certificate with
openssl, which requires a non-trivial piece of code for
manually matching the desired hostname to the string provided
by the certificate, not provided as a library function.

That is, with openssl, this only validates that the received
certificate is signed with the right CA, but not that it is
the actual server we think we're talking to.

Verification is still disabled by default since we can't count
on a proper CA database existing at all times.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

Values outside would not be possible due to limitations of jpeg itself

Fixes very long running loop
Fixes Ticket2977
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  g2meet: Respect cursor_stride properly everywhere

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

This prevents underflows in quite constrained cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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