1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Michael Niedermayer 2ce43b37fc 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>
2012-12-30 13:54:50 +01:00
..
2012-10-08 11:22:42 +02:00
2012-12-15 11:46:47 +01:00
2012-12-23 20:25:28 +01:00
2012-12-23 21:22:43 +00:00
2012-12-21 00:18:34 +01:00
2012-12-24 00:53:55 +01:00
2012-12-21 00:18:34 +01:00
2012-10-02 09:43:27 +02:00
2012-12-21 00:18:34 +01:00