Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:29:04 +0000 (21:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 19:29:04 +0000 (21:29 +0200)
commit554a1ecab7efbdaf10ab459d73152bfb6e355dfa
tree5acd189ee221e94ac72514755b45c3c0e0e3eb07
parent5b4c8aac97863b4830717db6cb2cd4e3093f9a88
parent7266e24f176389d2e81bfc7c829934f7c8ae361c
Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'

* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
  hls: Sync the file number with the start sequence

Conflicts:
libavformat/hlsenc.c

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