diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 22:30:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 22:30:49 +0200 |
| commit | 211ad5042adcf9f6e8abb9d0f1f3316331481535 (patch) | |
| tree | 4fb580c154ec4f6c5900cce604ea038b19ecdd48 /doc/formats.texi | |
| parent | 2b06f5f8f15a4464c74405cd7da57da2d6be5d36 (diff) | |
| parent | dbb534cea6b2b135485fd04cea022d08a350ac37 (diff) | |
| download | ffmpeg-211ad5042adcf9f6e8abb9d0f1f3316331481535.tar.gz | |
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>
Diffstat (limited to 'doc/formats.texi')
0 files changed, 0 insertions, 0 deletions