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

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

* 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.

The spec doesn't describe how it should be decoded so this is probably
the safest thing to do. Fixes valgrind errors on fuzzed11.ivf and fixes
valgrind errors on fuzzed10.ivf differently.

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

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

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

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

* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

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

* commit 'f90a4bfc':
  mlpdec: fix request_channel_layout behavior.

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

That prevents processing of media files with
incompatible or unsupported settings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This version requires fewer code and is safer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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