[FFmpeg-cvslog] Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 13:40:42 2014 +0200| [4991eacc064f5edd3acba4ce0d9e0ce27cee2b42] | committer: Michael Niedermayer

Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'

* commit '962d63157322466a9a82f9f9d84c1b6f1b582f65':
  matroskaenc: set the stream timebase earlier

Conflicts:
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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