[FFmpeg-cvslog] Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 30 13:54:50 2012 +0100| [2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf] | committer: Michael Niedermayer

Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'

* commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf
---