Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 18:52:58 +0000 (20:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Apr 2014 18:52:58 +0000 (20:52 +0200)
commit8522dd380b2a0f98cfaafcf0ae64bd46ac031ae1
tree8e60197c31234012a8d7a8b52d26f7215269b151
parent67979b593699ea02ba1b9c60db53e15dcd5fbc1c
parentc7603b3c243331057300337a61464e6ac4a605cb
Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'

* commit 'c7603b3c243331057300337a61464e6ac4a605cb':
  hls: Print start_number as first sequence value

Conflicts:
libavformat/hlsenc.c

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