[FFmpeg-cvslog] Merge remote-tracking branch 'jamrial/release/2.0' into release/2.0

Michael Niedermayer git at videolan.org
Mon Sep 23 22:40:11 CEST 2013


ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 22:30:42 2013 +0200| [211ad5042adcf9f6e8abb9d0f1f3316331481535] | committer: Michael Niedermayer

Merge remote-tracking branch 'jamrial/release/2.0' into release/2.0

* jamrial/release/2.0:
  avformat/matroskadec: check out_samplerate before using it in av_rescale()
  matroskadec: Improve TTA duration calculation
  avformat/oggparsevorbis: fix leak of tt
  avformat/oggparsevorbis: fix leak of ct

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list