diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 23:18:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 23:18:46 +0200 |
| commit | 7043e435dd887803ff13299269b5b4d7b0c09b3e (patch) | |
| tree | 0b0e726c32572350e281818aa6b7cd61005f39d1 /ffmpeg.h | |
| parent | f7fcd40e63fd36f3b158379318b5805a58b79b73 (diff) | |
| parent | 40b8e7f168e36b91f8119c1482122140de2a5813 (diff) | |
| download | ffmpeg-7043e435dd887803ff13299269b5b4d7b0c09b3e.tar.gz | |
Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1
* jamrial/release/1.1:
avformat/matroskadec: check out_samplerate before using it in av_rescale()
matroskadec: Improve TTA duration calculation
matroskaenc: simplify mkv_check_tag()
lavf/matroskaenc: Check for valid metadata before creating tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions