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)
* commit '30a76487304e7250294c9c0e9fa179bf07fd822a':
  hlsenc: make segment number unsigned
  hlsenc: make EXT-X-MEDIA-SEQUENCE always increase

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

Simple merge