Michael Niedermayer 883bc7d2e7 Merge commit '55f03d872640175a00bfa262da4652b7312b905f'
* commit '55f03d872640175a00bfa262da4652b7312b905f':
  hlsenc: Add parameter -hls_allow_cache

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
	libavformat/version.h

See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-03 21:46:40 +02:00
..
2014-08-24 14:35:11 +02:00
2014-07-20 02:01:50 +02:00
2014-06-03 10:58:19 -08:00
2014-09-17 07:55:56 +00:00
2014-05-28 03:52:50 +02:00
2012-12-21 00:18:34 +01:00
2013-02-14 23:45:48 +01:00
2014-07-17 11:29:01 +02:00