Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 12:54:50 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 12:54:50 +0000 (13:54 +0100)
commit2ce43b37fc46e3744d9d5e1baa1280c48ef7b1bf
tree24ca5287a90069a324ee49ad251f0d9a69ca0aea
parent613001d75fee9dfef14fb000cac8c67ac6381e97
parent6dd93ee6f1b050ad7c4b247899e83efa293ee405
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@gmx.at>
Changelog
doc/APIchanges
libavformat/hlsenc.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h