* commit '9c15ef35':
  oggparsevorbis: support official chapter extension

Conflicts:
	libavformat/oggparsevorbis.c

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

* commit '16ea20c8':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '66d3f5fd':
  lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '364af376':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9ab5f710':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'df6737a5':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Also set color space.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Elaborate on flushing the decoder.

The packet data does not need to be aligned.

CC:libav-stable@libav.org

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  riff: Add a mapping for VP6A
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

This allows demuxing VP6A from F4V files.
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>

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

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

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

This adds a AVStream pointer to Track
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>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  prores: Reject negative run and level values

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

This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.

Fixes d24da748

* qatar/master:
  mxf: Add jpeg2000 codec to intra only codecs

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

* commit '5f5ada3d':
  shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>