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)
commit56c71cd599862e02c4b579efe8eace376933efd4
treee15d5644c509d47b953c545d7fff2d57cf0729e8
parent19e1c8e4f203a9445aadfc683449968a59f9aa81
parent9b1370aced385698bc783747917544ab69ecb373
Merge commit '9b1370aced385698bc783747917544ab69ecb373'

* 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>
libavformat/hlsenc.c