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-09-16 14:55:33 +02:00
2014-10-02 20:21:00 +02:00
2014-09-06 01:37:31 +02:00
2014-09-22 23:35:49 +02:00
2014-09-03 10:16:05 -08:00
2014-09-12 01:59:44 +02:00
2014-10-01 16:39:19 +02:00
2014-09-11 01:27:38 +02:00
2014-09-08 17:49:20 +02:00
2014-08-28 12:20:18 +02:00
2014-09-08 17:49:20 +02:00
2014-08-27 16:00:17 -08:00
2014-09-17 07:55:56 +00:00
2014-09-26 10:35:14 +02:00
2014-09-22 02:55:24 +02:00
2014-09-04 02:34:20 +02:00
2014-10-03 21:46:40 +02:00
2014-09-04 02:34:20 +02:00
2014-09-06 01:37:31 +02:00
2014-09-06 01:37:31 +02:00
2014-09-06 01:37:31 +02:00
2014-09-03 12:24:47 +02:00