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)
commit211ad5042adcf9f6e8abb9d0f1f3316331481535
tree4fb580c154ec4f6c5900cce604ea038b19ecdd48
parent2b06f5f8f15a4464c74405cd7da57da2d6be5d36
parentdbb534cea6b2b135485fd04cea022d08a350ac37
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@gmx.at>