[FFmpeg-cvslog] Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 28 23:18:41 2013 +0200| [7043e435dd887803ff13299269b5b4d7b0c09b3e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7043e435dd887803ff13299269b5b4d7b0c09b3e
---