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>

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

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.

Useful to generate playlists with absolute paths.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Useful to generate lists with absolute urls.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Should fix FFmpeg Coverity Scan issue #732177
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Should fix FFmpeg Coverity Scan issue #732176
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Should fix Coverity Scan issue #732178
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Should fix FFmpeg Coverity Scan issue #732181
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Should fix FFmpeg Coverity Scan issues #732180 & #732182
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

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

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

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

* commit 'a61c2115':
  configure: rework dxva in avconv handling

Conflicts:
	Makefile
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '35177ba7':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b2b4afe8':
  hwaccel: fix dxva2 & vaapi loop filter parameters

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

* commit 'ed4b7571':
  dxva2_h264: add a workaround for old Intel GPUs

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

* commit '2fcef90b':
  dxva2_h264: set the correct ref frame index in the long slice struct

Conflicts:
	libavcodec/dxva2_h264.c

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

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