Merge commit '55f03d872640175a00bfa262da4652b7312b905f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 19:43:46 +0000 (21:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 19:46:40 +0000 (21:46 +0200)
commit883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c
tree7a11e3ae930a8d765adc61d11bd52cb9fc8cc461
parentdd3bfe3cc1ca26d0fff3a3baf61a40207032143f
parent55f03d872640175a00bfa262da4652b7312b905f
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>
doc/muxers.texi
libavformat/hlsenc.c
libavformat/version.h