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

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

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

* commit 'a7c5fdda':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9d76dd95':
  h264: drop commented out cruft

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

* commit 'c1f92d13':
  mpegvideo: remove unused MpegEncContext.b4_stride
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6a13505c':
  mpegvideo: move the MpegEncContext fields used from arm asm to the beginning
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

avcodec/hevc: fix no output of prior pics and pic output flags(cherry picked from commit e99b96dff1d76d74cb5633aa9702828d863050e2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These ids should be meaningless for the end user and would only
confuse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* cigaes/master:
  lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
  lavf/concatdec: implement automatic conversions.
  lavf/concatdec: reindent after last commit.
  lavf/concatdec: always do stream matching.
  lavf/concatdec: check match_streams() return value.
  lavf/concatdec: use a structure for each stream.
  ffprobe: use the codec descriptor if no decoder was found.
  lavf/matroska: add "binary" pseudo-MIME type.
  lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.
  lavc: add a mime_types field to codec descriptors.
  lavc: add AV_CODEC_ID_BIN_DATA.
  lavc: add codec descriptors for TTF and OTF.
  lavc: add codec descriptors for deprecated ids.
  lavc/codec_desc: add separation comment.
  tools/ffhash: implement base64 output.
  tools/ffhash: use av_hash_final_hex().
  lavu/hash: add hash_final helpers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This avoids issues with inconsistent headers with different versions of mingw-w64 and older MSVC variants.

Fixes FATE builds of MSVC 2010.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* commit '5a70a783':
  hls: Add an option to prepend a baseurl to the playlist entries

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5c08ae4f':
  segment: Add an option to prepend a string to the list entries

Conflicts:
	doc/muxers.texi
	libavformat/segment.c

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

Fixes: 111342.ogm with ffplay
Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should reduce the frequency with which the offsets need to be
updated.

Avoid long scan and "Could not find codec parameters for stream"
error when an attachment has this type.

The minor bump also covers AV_CODEC_ID_BIN_DATA.

Also fix usage string: the algorithm is not optional.

The helpers use local memory to compute the final hash,
making AV_HASH_MAX_SIZE safe to use.