* commit '6dd93ee6':
  hlsenc: check append_entry return value
  hlsenc: use the basename to generate the list entries
  avstring: add av_basename and av_dirname

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