[FFmpeg-cvslog] Merge commit '9b1370aced385698bc783747917544ab69ecb373'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 30 14:11:11 2012 +0100| [56c71cd599862e02c4b579efe8eace376933efd4] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56c71cd599862e02c4b579efe8eace376933efd4
---