Merge commit '9b1370aced385698bc783747917544ab69ecb373'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:11:11 +0000 (14:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 30 Dec 2012 13:11:17 +0000 (14:11 +0100)
* commit '9b1370aced385698bc783747917544ab69ecb373':
  hlsenc: do not add timestamps in different timebases
  hlsenc: use the correct AV_TIME_BASE macro

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

Simple merge