Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:21:50 +0000 (14:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:21:55 +0000 (14:21 +0100)
commit384dd9804d63fead9bb884a52ff53c17348741e9
tree931bee676ef434095205090478e70fd2ea9a4dd8
parent56c71cd599862e02c4b579efe8eace376933efd4
parent30a76487304e7250294c9c0e9fa179bf07fd822a
Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a'

* commit '30a76487304e7250294c9c0e9fa179bf07fd822a':
  hlsenc: make segment number unsigned
  hlsenc: make EXT-X-MEDIA-SEQUENCE always increase

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