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)
* 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>
1  2 
libavformat/matroskadec.c

Simple merge