Merge remote-tracking branch 'jamrial/release/2.0' into release/2.0
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 20:30:42 +0000 (22:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 20:30:49 +0000 (22:30 +0200)
* 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@gmx.at>

Trivial merge