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

[Michael Niedermayer]

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 00:22:21 2013 +0200| [81ca7826638e1355b41fdc56583e9929fe1a69e1] | committer: Michael Niedermayer

Merge remote-tracking branch 'jamrial/release/1.0' into release/1.0

* jamrial/release/1.0:
  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=81ca7826638e1355b41fdc56583e9929fe1a69e1
---