Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 21:18:41 +0000 (23:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 21:18:46 +0000 (23:18 +0200)
commit7043e435dd887803ff13299269b5b4d7b0c09b3e
tree0b0e726c32572350e281818aa6b7cd61005f39d1
parentf7fcd40e63fd36f3b158379318b5805a58b79b73
parent40b8e7f168e36b91f8119c1482122140de2a5813
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>
libavformat/matroskadec.c