Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:14:56 +0000 (21:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:14:56 +0000 (21:14 +0200)
commit5b4c8aac97863b4830717db6cb2cd4e3093f9a88
tree84d71b43257dac63fb4bf30b9e9b1d8fd2784c23
parent8522dd380b2a0f98cfaafcf0ae64bd46ac031ae1
parenta16431034d9bd44182bf844d6bbde2c98bc4e6b5
Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'

* commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5':
  hls: Factor the sequence computation

Conflicts:
libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hlsenc.c