* commit '0092c1dd':
  matroskaenc: allow override of "writing application" tag

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

* commit '61985ad7':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8c095326':
  rv10: K&R formatting cosmetics

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

* commit 'b4d372e0':
  rv10: Forward error from rv10_decode_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a8014534':
  g2meet: K&R formatting cosmetics

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

Signed-off-by: Tim Walker <tdskywalker@gmail.com>

CC: libav-stable@libav.org

The overread avoidance fix in cbddee1c
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org

Also sort #includes into canonical order.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

* cigaes/master:
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: more reliable test for absolute URLs.
  lavf: add subfile protocol.
  lavfi/af_atempo: clear references before returning error.
  lavd/xv: take aspect ratio into account.
  lavc/pthread: copy packet side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3447.

ff_make_absolute_url() recognizes the "://" pattern usual
in HTTP-like protocols, but consider relative URLs starting
with just the protocol name or using the comma syntax for
options.

Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.

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

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

Fixes generation of NaN output
Fixes: nan_example.wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fic: Properly handle skip frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f69befe5':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

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

* commit '84cfce9f':
  matroskadec: K&R formatting cosmetics

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

This resolves a decoding failure on Intel GPUs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8bbb02ae':
  rtmppkt: Properly handle extended timestamps when writing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also sort #includes into canonical order.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

* commit '48cfb5f4':
  rtmppkt: Add a descriptive comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b2ad78f':
  rtmppkt: Handle extended timestamp field even for one-byte header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '93d216d3':
  dict: K&R formatting cosmetics

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

Based on a suggestion by Martin Panter. This is more descriptive,
since it's the actual timestamp field from the RTMP packet,
which might or might not be a delta depending on context (in
some packets it's a delta, in some packets it's an absolute
timestamp, and in some packets it's 0xffffff to indicate that
the actual delta or absolute timestamp is transmitted separately).
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

Related fix in "rtmpdump":
https://repo.or.cz/w/rtmpdump.git/commitdiff/79459a2

Adobe's RTMP specification (21 Dec 2012), section 5.3.1.3 ("Extended
Timestamp"), says "this field is present in Type 3 chunks". Type 3 chunks are
those with the one-byte header size.

This resolves intermittent hangs and segfaults caused by the read function,
and also includes an untested fix for the write function.

The read function was tested with ABC (Australia) News 24 streams, however
they are probably restricted to only Australian internet addresses. Some of
the packets at the start of these streams seem to contain junk timestamp
fields, often requiring the extended field. Test command:

avplay rtmp://cp81899.live.edgefcs.net/live/news24-med@28772Signed-off-by: Martin Storsjö <martin@martin.st>