* commit '29216d7f':
  tls: fix compilation when both gnutls and openssl are enabled

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

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: James Almer <jamrial@gmail.com>

This is the 2nd patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '94599a6d':
  tls: Remove all the local polling loops
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd13b124e':
  tls: Remove the nonblocking code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd15eec4d':
  tls: Use custom IO to read from the URLContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This is the 1st patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These aren't necessary any longer.
Signed-off-by: Martin Storsjö <martin@martin.st>

Since the underlying URLContext read functions are used,
they handle interruption, without having to handle it at
this level.
Signed-off-by: Martin Storsjö <martin@martin.st>

This avoids hijacking the fd, by reading using the normal
URLContext functions instead. This allowing reading data that has
been buffered in the underlying URLContext.

This avoids using the libraries own send functions that can
cause SIGPIPE.

The fd is still used for polling the lowlevel socket, for
waiting for retries.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

the incorrect UMULH, ff_sqrt, MAC64 and MLS64 to be optimized later, delete them just for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Better to be explicit before someone thinks this could be the time axis ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

avutil/pixfmt: Clarify that the ASCII art describes the location of the first chroma sample of AVChromaLocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  lavc/qdrw: Do not fail decoding valid Quickdraw images.
  lavf/mov: Use AVCOL_SPC constants when checking color_space.
  lavf/mov: Write colour matrix "6" for color_space bt470bg.
  lavf/mkv: Only skip prores header if the packet is large enough.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Suggested-by: Ronald Bultje

This matches the demuxer's behaviour.

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

Fixes a possible endless loop.

* commit '3efe0393':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
	libavcodec/hevc.c

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

These loops can take a lot of time if count is very large.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

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

* commit '7046bd9b':
  lavfi: Move avcodec header to the only filter needing it

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

This can unnecessarily waste a lot of time.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

nut->last_syncpoint_pos doesn't necessarily change between resync
attempts, so find_any_startcode can return the same startcode again.

Thus remember where the last resync happened and don't try to resync
before that.

This can't be done locally in nut_read_packet, because this wouldn't
prevent infinite resync loops, where after the resync a packet is
returned and while reading a following packet the resync happens again.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

This also makes the code more robust, removing potential out of
array writes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'eafbc671':
  vmnc: Delay pixel size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>