* commit '4c750599':
  lavf: rewrite the av_write_frame() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ad7f2b69':
  lavf: rewrite the av_interleaved_write_frame() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b36bc81c':
  avplay: add support for seeking to chapter marks

Conflicts:
	doc/ffplay.texi
	ffplay.c

ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.

Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f548f9f9':
  hevc: update conformance streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b5f851ed':
  FATE: force FLAC in the lavf ogg test

Conflicts:
	tests/lavf-regression.sh

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

* commit '38893dc0':
  pcmdec: replace a reachable assert with an error check

Conflicts:
	libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cca4742a':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
	doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd711d839':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Remove some vague / incorrect statements and make the text more specific
and less confusing.

Remove some vague / incorrect statements and make the text more specific
and less confusing.

New streams: LTRPSPS_A_Qualcomm_1, SLPPLP_A_VIDYO_1, VPSID_A_VIDYO_1
Updated streams: EXT_A_ericsson_4, NUT_A_ericsson_5, RPS_C_ericsson_5,
  RPS_D_ericsson_6
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Since b0c2c097, vorbis would be used if libvorbis is compiled in.

Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.

* qatar/master:
  hevc: Conceal zero td
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e95018b6':
  dnxhd: Support DNx444

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

* commit '2f6eec65':
  vp8: fix PPC assembly to work if src_stride != dst_stride

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

* commit 'b37effdc':
  mxfdec: free descriptor extradata in .read_close()

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

* commit '6a8475dc':
  asvenc: free avctx->coded_frame on codec close

Not merged as we do not allocate coded_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd6eac2f1':
  arm: Remove a stray .fpu directive
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28e508a9':
  dnxhddec: return proper error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'b0c2c097':
  lavf: default .ogg audio to libvorbis if we can
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bc3f0356':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
	libavcodec/g2meet.c

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

It was done only in check_mvset(), while mv_scale() is called also by
dist_scale().

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

Bug-Id: 99
Bug-Id: videolan/9620
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '72255478':
  Add raw HEVC muxer

Conflicts:
	libavformat/version.h

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

Fixes memleak in fate-mxf-demux.

Spotted-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

The directional intra predictors either don't care about order (dc, h,
dc_left, tm), or they prefer inverted order (vr, dr, hd). This allows
more efficient SIMD implementations.

Use same function for segmentation map writing also.